mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Matthew Swift
26.57.2013 099e528f6399dc1655c8d9c5cf60fe2326ef47dd
Fix OPENDJ-1191: Rare NPE in StaticUtils.isLocalAddress()
1 files modified
18 ■■■■■ changed files
opends/src/server/org/opends/server/types/HostPort.java 18 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/types/HostPort.java
@@ -136,17 +136,19 @@
      {
        final Enumeration<NetworkInterface> i =
            NetworkInterface.getNetworkInterfaces();
        final Set<InetAddress> newLocalAddresses = new HashSet<InetAddress>();
        while (i.hasMoreElements())
        {
          NetworkInterface n = i.nextElement();
          Enumeration<InetAddress> j = n.getInetAddresses();
          while (j.hasMoreElements())
        if (i != null) {
          final Set<InetAddress> newLocalAddresses = new HashSet<InetAddress>();
          while (i.hasMoreElements())
          {
            newLocalAddresses.add(j.nextElement());
            NetworkInterface n = i.nextElement();
            Enumeration<InetAddress> j = n.getInetAddresses();
            while (j.hasMoreElements())
            {
              newLocalAddresses.add(j.nextElement());
            }
          }
          localAddresses = newLocalAddresses;
        }
        localAddresses = newLocalAddresses;
      }
      catch (SocketException e)
      {