zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1540960 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
Date Tue, 12 Nov 2013 06:30:06 GMT
Author: phunt
Date: Tue Nov 12 06:30:06 2013
New Revision: 1540960

URL: http://svn.apache.org/r1540960
Log:
ZOOKEEPER-1812. ZooInspector reconnection always fails if first connection fails (Benjamin
Jaton via phunt)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1540960&r1=1540959&r2=1540960&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Nov 12 06:30:06 2013
@@ -155,6 +155,9 @@ BUGFIXES:
   ZOOKEEPER-1798. Fix race condition in testNormalObserverRun
   (thawan, fpj via thawan)
 
+  ZOOKEEPER-1812. ZooInspector reconnection always fails if first
+  connection fails (Benjamin Jaton via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1564. Allow JUnit test build with IBM Java

Modified: zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java?rev=1540960&r1=1540959&r2=1540960&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
(original)
+++ zookeeper/branches/branch-3.4/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
Tue Nov 12 06:30:06 2013
@@ -173,12 +173,14 @@ public class ZooInspectorManagerImpl imp
                 }
                 ((ZooKeeperRetry) this.zooKeeper).setRetryLimit(10);
                 connected = ((ZooKeeperRetry) this.zooKeeper).testConnection();
-                return connected;
             }
         } catch (Exception e) {
+            connected = false;
             e.printStackTrace();
         }
-        connected = false;
+        if (!connected){
+        	disconnect();
+        }
         return connected;
     }
 



Mime
View raw message