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 2012/10/23 15:22:43 UTC

svn commit: r1401286 - in /zookeeper/bookkeeper/trunk: CHANGES.txt hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java

Author: ivank
Date: Tue Oct 23 13:22:43 2012
New Revision: 1401286

URL: http://svn.apache.org/viewvc?rev=1401286&view=rev
Log:
BOOKKEEPER-427: TestConcurrentTopicAcquisition hangs every so often (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1401286&r1=1401285&r2=1401286&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Oct 23 13:22:43 2012
@@ -110,6 +110,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-392: Racey ConcurrentMap usage in java hedwig-client (Stu Hood via sijie)
 
+        BOOKKEEPER-427: TestConcurrentTopicAcquisition hangs every so often (ivank)
+
       hedwig-server:
 
         BOOKKEEPER-302: No more messages delivered when hub server scans messages over two ledgers. (sijie via ivank)

Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java?rev=1401286&r1=1401285&r2=1401286&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java Tue Oct 23 13:22:43 2012
@@ -100,6 +100,7 @@ public class SimpleSubscribeResponseHand
                                              HChannelManager channelManager) {
         super(cfg, channelManager);
         sChannelManager = (SimpleHChannelManager) channelManager;
+        origTopicSubscriber = null;
     }
 
     protected HChannelManager getHChannelManager() {
@@ -484,6 +485,9 @@ public class SimpleSubscribeResponseHand
     @Override
     public void onChannelDisconnected(InetSocketAddress host,
                                       Channel channel) {
+        if (origTopicSubscriber == null) {
+            return;
+        }
         sChannelManager.clearHostForTopic(origTopicSubscriber.getTopic(), host);
         // clear subscription status
         sChannelManager.asyncCloseSubscription(origTopicSubscriber, new Callback<ResponseBody>() {