summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index d9d91f1ebe..cfb4b2053e 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -523,11 +523,13 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
{
// //fixme this probably is not right
// if (!isNoConsume())
- { // done in BasicCancelOK Handler but not sending one so just deregister.
- deregisterConsumer();
- }
+ //{ // done in BasicCancelOK Handler but not sending one so just deregister.
+ // deregisterConsumer();
+ //}
}
+ deregisterConsumer();
+
if (_messageListener != null && _receiving.get() && _receivingThread != null)
{
if (_logger.isInfoEnabled())
@@ -1011,7 +1013,7 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
this._queuename = queuename;
}
- public void addBindingKey(AMQDestination amqd, String routingKey) throws AMQException
+ public void addBindingKey(AMQDestination amqd, String routingKey) throws AMQException
{
_session.addBindingKey(this,amqd,routingKey);
}