svn commit: r627634 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java

[rajith]

Author: rajith
Date: Wed Feb 13 18:09:59 2008
New Revision: 627634

URL: http://svn.apache.org/viewvc?rev=627634&view=rev
Log:
Fix for Qpid-793

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=627634&r1=627633&r2=627634&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
 Wed Feb 13 18:09:59 2008
@@ -523,11 +523,13 @@
                 {
                     // //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 @@
         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);
     }