From 56620da8293fb5b6a4fab5d950ea2037629815ac Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 17 May 2007 13:26:25 +0000 Subject: 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 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@538912 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'java/broker') diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 9f803558d1..52e9505a32 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java @@ -357,10 +357,16 @@ public class AMQChannel */ 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 -- cgit v1.2.1