Fix OPENDJ-882: NullPointerException in access log filtering code

Matthew Swift

26.37.2013 cc5cd8e28bfd778cb35440f3331c080733fb390a

Fix OPENDJ-882: NullPointerException in access log filtering code

 opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java

@@ -107,11 +107,13 @@
  public static boolean maskListContains(final InetAddress address,
      final Collection<AddressMask> masks)
  {
    for (final AddressMask mask : masks)
    {
      if (mask.match(address))
    if (address != null) {
      for (final AddressMask mask : masks)
      {
        return true;
        if (mask.match(address))
        {
          return true;
        }
      }
    }
    return false;

 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java

@@ -34,6 +34,7 @@

import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;

public class TestAddressMask extends TypesTestCase {
@@ -235,6 +236,12 @@
    assertEquals(rule, m.toString());
  }

  @Test
  public void testNullMatch() throws Exception {
    AddressMask m = AddressMask.decode("*.*.*.*");
    assertFalse(AddressMask.maskListContains(null, Arrays.asList(m)));
  }

  private boolean match(String[] rules, String[] addrs, String[] hostNames)
      throws Exception
  {