Merge pull request #72 from dybdahl/master

Bug fix, if user calls resolve while zookeeper is down..
Cloudname · Aug 6, 2012 · a97e623 · a97e623
2 parents ff3bb8f + 5bdcac5
commit a97e623
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cn/src/main/java/org/cloudname/zk/DynamicExpression.java b/cn/src/main/java/org/cloudname/zk/DynamicExpression.java
@@ -260,7 +260,9 @@ private void notifyClient() {
                 newEndpointsByName.put(getEndpointKey(endpoint), endpoint);
             }
 
-            for (Map.Entry<String, Endpoint> endpointEntry : clientPicture.entrySet()) {
+            Iterator<Map.Entry<String, Endpoint>> it = clientPicture.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry<String, Endpoint> endpointEntry = it.next();
                 String key = endpointEntry.getKey();
 
                 if (! newEndpointsByName.containsKey(key)) {

diff --git a/cn/src/main/java/org/cloudname/zk/ZkResolver.java b/cn/src/main/java/org/cloudname/zk/ZkResolver.java
@@ -284,7 +284,12 @@ public List<Endpoint> resolve(String addressExpression) throws CloudnameExceptio
             // not sure I am too fond of the check for negative values to
             // have some particular semantics.  That smells like a problem
             // waiting to happen.
-        List<Integer> instances = resolveInstances(parameters, zk);
+
+        ZooKeeper localZkPointer = getZooKeeper();
+        if (localZkPointer == null) {
+            throw new CloudnameException("No connection to ZooKeeper.");
+        }
+        List<Integer> instances = resolveInstances(parameters, localZkPointer);
 
         List<Endpoint> endpoints = new ArrayList<Endpoint>();
         for (Integer instance : instances) {
@@ -299,7 +304,7 @@ public List<Endpoint> resolve(String addressExpression) throws CloudnameExceptio
                 throw new CloudnameException(e);
 
             }
-            ZkCoordinateData zkCoordinateData = ZkCoordinateData.loadCoordinateData(statusPath, getZooKeeper(), null);
+            ZkCoordinateData zkCoordinateData = ZkCoordinateData.loadCoordinateData(statusPath, localZkPointer, null);
             addEndpoints(zkCoordinateData.snapshot(), endpoints, parameters.getEndpointName());
 
         }