zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1163655 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
Date Wed, 31 Aug 2011 14:59:46 GMT
Author: ivank
Date: Wed Aug 31 14:59:46 2011
New Revision: 1163655

URL: http://svn.apache.org/viewvc?rev=1163655&view=rev
Log:
BOOKKEEPER-57: NullPointException at bookie.zk@EntryLogger (xulei via ivank)

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

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1163655&r1=1163654&r2=1163655&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Aug 31 14:59:46 2011
@@ -36,12 +36,15 @@ BUGFIXES:
 
   BOOKKEEPER-18: maven build is unstable (morel, ivank via ivank)
 
+  BOOKKEEPER-57: NullPointException at bookie.zk@EntryLogger (xulei via ivank)
+
  hedwig-server/
 
   BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed)
   
   BOOKKEEPER-51: NullPointException at FIFODeliveryManager#deliveryPtrs (xulei via ivank)
 
+
  hedwig-client/
  
   BOOKKEEPER-52: Message sequence confuse due to the subscribeMsgQueue@SubscribeResponseHandler
(xulei via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java?rev=1163655&r1=1163654&r2=1163655&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
Wed Aug 31 14:59:46 2011
@@ -142,7 +142,7 @@ public class EntryLogger {
                     }
                 }
                 // Initialization check. No need to run any logic if we are still starting
up.
-                if (entryLogs2LedgersMap.isEmpty() || bookie.ledgerCache == null
+                if (bookie.zk == null || entryLogs2LedgersMap.isEmpty() || bookie.ledgerCache
== null
                         || bookie.ledgerCache.activeLedgers == null) {
                     continue;
                 }



Mime
View raw message