You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/05/17 15:26:27 UTC

svn commit: r538912 - in /incubator/qpid/branches/M2: java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java python/java_failing.txt

Author: ritchiem
Date: Thu May 17 06:26:25 2007
New Revision: 538912

URL: http://svn.apache.org/viewvc?view=rev&rev=538912
Log:
Fixed failing python tests. The rather annoying way we unsubscribe subscribers by creating new ones was causing a problem as the closing channel had been closed before the unsubscribe call.
Java now passes all python tests 

Modified:
    incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    incubator/qpid/branches/M2/python/java_failing.txt

Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=538912&r1=538911&r2=538912
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Thu May 17 06:26:25 2007
@@ -357,10 +357,16 @@
      */
     public void close(AMQProtocolSession session) throws AMQException
     {
-        _closing = true;
         _txnContext.rollback();
         unsubscribeAllConsumers(session);
         requeue();
+
+        setClosing(true);
+    }
+
+    private void setClosing(boolean closing)
+    {
+        _closing = closing;
     }
 
     private void unsubscribeAllConsumers(AMQProtocolSession session) throws AMQException

Modified: incubator/qpid/branches/M2/python/java_failing.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/python/java_failing.txt?view=diff&rev=538912&r1=538911&r2=538912
==============================================================================
--- incubator/qpid/branches/M2/python/java_failing.txt (original)
+++ incubator/qpid/branches/M2/python/java_failing.txt Thu May 17 06:26:25 2007
@@ -1,2 +0,0 @@
-tests.exchange.RecommendedTypesRuleTests.testTopic
-tests.exchange.RequiredInstancesRuleTests.testAmqTopic