Fix for Bug 7016: error when there is no DNS setting

nimbusproject · May 20, 2010 · b912f8e · b912f8e
1 parent cb1f47b
commit b912f8e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/service/service/java/source/src/org/globus/workspace/network/defaults/Util.java b/service/service/java/source/src/org/globus/workspace/network/defaults/Util.java
@@ -324,8 +324,8 @@ private static Association getNewAssoc(String assocName,
         if (oldassocEntries == null || oldassocEntries.isEmpty()) {
             return assoc;
         }
-        
-        if (!assoc.getDns().equals(oldassoc.getDns())) {
+
+        if (assoc.getDns() != null && !assoc.getDns().equals(oldassoc.getDns())) {
             logger.info("Network '" + assocName + "': DNS changed from " +
                         oldassoc.getDns() + " to " + assoc.getDns());
         }