svn commit: r1415920 - in /zookeeper/bookkeeper/trunk: CHANGES.txt hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java

[sijie]

Author: sijie
Date: Sat Dec  1 05:32:49 2012
New Revision: 1415920

URL: http://svn.apache.org/viewvc?rev=1415920&view=rev
Log:
BOOKKEEPER-482: Precommit is reporting findbugs errors in trunk (ivank via 
sijie)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1415920&r1=1415919&r2=1415920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Dec  1 05:32:49 2012
@@ -150,6 +150,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-440: Make Write/Delete SubscriptionData Restricted to 
Version (Fangmin Lv via ivank)
 
+        BOOKKEEPER-482: Precommit is reporting findbugs errors in trunk (ivank 
via sijie)
+
     IMPROVEMENTS:
 
       BOOKKEEPER-467: Allocate ports for testing dynamically (ivank)

Modified: 
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java?rev=1415920&r1=1415919&r2=1415920&view=diff
==============================================================================
--- 
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
 (original)
+++ 
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
 Sat Dec  1 05:32:49 2012
@@ -106,7 +106,13 @@ public class InMemorySubscriptionManager
     protected void readSubscriptionData(ByteString topic,
             ByteString subscriberId, Callback<InMemorySubscriptionState> cb, 
Object ctx) {
         // Since we backed up in-memory information on lostTopic, we can just 
return that back
-        InMemorySubscriptionState subState = 
top2sub2seqBackup.get(topic).remove(subscriberId);
+        Map<ByteString, InMemorySubscriptionState> sub2seqBackup = 
top2sub2seqBackup.get(topic);
+        if (sub2seqBackup == null) {
+            cb.operationFinished(ctx, new InMemorySubscriptionState(
+                    SubscriptionData.getDefaultInstance(), Version.NEW));
+            return;
+        }
+        InMemorySubscriptionState subState = 
sub2seqBackup.remove(subscriberId);
         
         if (subState != null) {
             cb.operationFinished(ctx, subState);