svn commit: r1503077 - in /zookeeper/bookkeeper/branches/branch-4.2: CHANGES.txt hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java

[fp...@apache.org]

Author: fpj
Date: Sun Jul 14 23:02:59 2013
New Revision: 1503077

URL: http://svn.apache.org/r1503077
Log:
BOOKKEEPER-600: shouldClaim flag isn't cleared for hedwig multiplex java client (sijie via fpj)

Modified:
    zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
    zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java

Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1503077&r1=1503076&r2=1503077&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Sun Jul 14 23:02:59 2013
@@ -52,6 +52,8 @@ Release 4.2.2 - Unreleased
 
         BOOKKEEPER-603: Support Boost 1.53 for Hedwig Cpp Client (jiannan via ivank)
 
+	BOOKKEEPER-600: shouldClaim flag isn't cleared for hedwig multiplex java client (sijie via fpj)
+
     NEW FEATURE:
 
       BOOKKEEPER-562: Ability to tell if a ledger is closed or not (fpj via ivank)

Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java?rev=1503077&r1=1503076&r2=1503077&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ActiveSubscriber.java Sun Jul 14 23:02:59 2013
@@ -17,26 +17,20 @@
  */
 package org.apache.hedwig.client.netty.impl;
 
+import static org.apache.hedwig.util.VarArgs.va;
+
 import java.util.LinkedList;
 import java.util.Queue;
 
-import com.google.protobuf.ByteString;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-
 import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.MessageConsumeData;
 import org.apache.hedwig.client.data.PubSubData;
 import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.exceptions.AlreadyStartDeliveryException;
+import org.apache.hedwig.client.netty.FilterableMessageHandler;
 import org.apache.hedwig.client.netty.HChannel;
 import org.apache.hedwig.client.netty.NetUtils;
-import org.apache.hedwig.client.netty.FilterableMessageHandler;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.filter.ClientMessageFilter;
 import org.apache.hedwig.protocol.PubSubProtocol.Message;
@@ -46,7 +40,11 @@ import org.apache.hedwig.protocol.PubSub
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionPreferences;
 import org.apache.hedwig.protoextensions.MessageIdUtils;
 import org.apache.hedwig.protoextensions.SubscriptionStateUtils;
-import static org.apache.hedwig.util.VarArgs.va;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * an active subscriber handles subscription actions in a channel.
@@ -371,6 +369,7 @@ public class ActiveSubscriber {
             new ResubscribeCallback(topicSubscriber, op,
                                     channelManager, retryWaitTime);
         op.setCallback(resubscribeCb);
+        op.shouldClaim = false;
         op.context = null;
         op.setOriginalChannelForResubscribe(hChannel);
         if (logger.isDebugEnabled()) {