From 099e528f6399dc1655c8d9c5cf60fe2326ef47dd Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 25 Oct 2013 22:57:24 +0000
Subject: [PATCH] Fix OPENDJ-1191: Rare NPE in StaticUtils.isLocalAddress()
---
opends/src/server/org/opends/server/types/HostPort.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/types/HostPort.java b/opends/src/server/org/opends/server/types/HostPort.java
index f5f9122..0aa5ab5 100644
--- a/opends/src/server/org/opends/server/types/HostPort.java
+++ b/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)
{
--
Gitblit v1.10.0