From b912f8e096aaa8136c30e447e3b8c1c9fea60c94 Mon Sep 17 00:00:00 2001
From: Tim Freeman <tim@timfreeman.org>
Date: Thu, 20 May 2010 10:38:33 -0500
Subject: [PATCH] Fix for Bug 7016: error when there is no DNS setting

---
 .../src/org/globus/workspace/network/defaults/Util.java       | 4 ++--
 1 file changed, 2 insertions(+), 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
index 708d8a55..28b47ec8 100644
--- 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());
         }