[Bigdata-commit] SF.net SVN: bigdata:[7477] branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src /java/com/bigdata/journal/jini/ha/HAJournalServer.java

[<tho...@us...>]

Revision: 7477
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7477&view=rev
Author:   thompsonbry
Date:     2013-10-24 18:31:18 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
Bug fix to exit the while(true) loop correctly in the ErrorTask if the zookeeper client was connected. See #718

Modified Paths:
--------------
    branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java

Modified: branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
===================================================================
--- branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java	2013-10-24 14:58:13 UTC (rev 7476)
+++ branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java	2013-10-24 18:31:18 UTC (rev 7477)
@@ -2118,8 +2118,7 @@
                             // Reduce to negotiated timeout GT ZERO.
                             sessionTimeout = sessionTimeout2;
                         }
-                        switch(zk.getState()) {
-                        case CONNECTED:
+                        if (zk.getState() == ZooKeeper.States.CONNECTED) {
                             break;
                         }
                         final long elapsed = System.nanoTime() - begin;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.