Fix OPENDJ-525: Remove compiler warnings when building using JDK7

Matthew Swift

19.26.2012 108e2020c1d149962dfc43dcbc6bc24a05a8e5f7

 opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java

@@ -336,20 +336,14 @@
            assertEquals(subInitialTestCurrent, mvf.getSubInitialElement());
          }

          if (subAnyTestCurrent == null)
          ret = mvf.getSubAnyElements();
          assertNotNull(ret);
          assertEquals(subAnyTestCurrent.size(), ret.size());
          for (ByteString r : ret)
          {
            assertNull(mvf.getSubAnyElements());
            assertTrue(subAnyTestCurrent.contains(r));
          }
          else
          {
            ret = mvf.getSubAnyElements();
            assertNotNull(ret);
            assertEquals(subAnyTestCurrent.size(), ret.size());
            for (ByteString r : ret)
            {
              assertTrue(subAnyTestCurrent.contains(r));
            }
          }

          if (subFinalTestCurrent == null)
          {
            assertNull(mvf.getSubFinalElement());
@@ -587,7 +581,7 @@
    AttributeValue attVal = null ;
    if (attType != null)
    {
      AttributeValues.create(attType, value);
      attVal = AttributeValues.create(attType, value);
    }

    // Check null, null