You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2011/08/30 11:14:33 UTC
svn commit: r1163149 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
Author: ivank
Date: Tue Aug 30 09:14:33 2011
New Revision: 1163149
URL: http://svn.apache.org/viewvc?rev=1163149&view=rev
Log:
BOOKKEEPER-51: NullPointException at FIFODeliveryManager#deliveryPtrs (xulei via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1163149&r1=1163148&r2=1163149&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Aug 30 09:14:33 2011
@@ -39,6 +39,8 @@ BUGFIXES:
hedwig-server/
BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed)
+
+ BOOKKEEPER-51: NullPointException at FIFODeliveryManager#deliveryPtrs (xulei via ivank)
IMPROVEMENTS:
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java?rev=1163149&r1=1163148&r2=1163149&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java Tue Aug 30 09:14:33 2011
@@ -250,6 +250,10 @@ public class FIFODeliveryManager impleme
throw new UnexpectedError("No delivery pointers found while disconnecting " + "channel for topic:" + topic);
}
+ if(null == deliveryPtrs) {
+ return;
+ }
+
if (!MapMethods.removeFromMultiMap(deliveryPtrs, seqId, subscriber) && !isAbsenceOk) {
throw new UnexpectedError("Could not find subscriber:" + subscriber + " at the expected delivery pointer");