svn commit: r1162912 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java

[ivank]

Author: ivank
Date: Mon Aug 29 17:33:01 2011
New Revision: 1162912

URL: http://svn.apache.org/viewvc?rev=1162912&view=rev
Log:
BOOKKEEPER-58: Changes introduced in BK-38 cause BookieClientTest to hang 
indefinitely. (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1162912&r1=1162911&r2=1162912&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Aug 29 17:33:01 2011
@@ -32,6 +32,8 @@ BUGFIXES:
 
   BOOKKEEPER-38: Bookie Server doesn't exit when its zookeeper session is 
expired. So the process is hang there. (Sijie Guo via breed)
 
+  BOOKKEEPER-58: Changes introduced in BK-38 cause BookieClientTest to hang 
indefinitely. (ivank)
+
  hedwig-server/
 
   BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed)

Modified: 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java?rev=1162912&r1=1162911&r2=1162912&view=diff
==============================================================================
--- 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
 (original)
+++ 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
 Mon Aug 29 17:33:01 2011
@@ -222,6 +222,7 @@ public class Bookie extends Thread {
         if (zkServers == null) {
             LOG.warn("No ZK servers passed to Bookie constructor so BookKeeper 
clients won't know about this server!");
             zk = null;
+            isZkExpired = false;
             return;
         }
         int zkTimeout = Integer.getInteger("zkTimeout", 10000);