summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-02-14 10:00:57 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-02-14 10:00:57 +0000
commit872e1d208f7bbcac43cd4862041d01b95c76ebbd (patch)
treefe7fab12bc5fadb120bc9e8a92070c64a3695c67
parenta7d8cbbde94ceecbb9795ff36dfdfd9ab994bbd4 (diff)
downloadqpid-python-872e1d208f7bbcac43cd4862041d01b95c76ebbd.tar.gz
Reverted change in position of closing consumers.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@507460 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 783678f67c..0648ed472d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -656,6 +656,9 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
if (!_closed.getAndSet(true))
{
+ // we pass null since this is not an error case
+ closeProducersAndConsumers(null);
+
try
{
_connection.getProtocolHandler().closeSession(this);
@@ -672,8 +675,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
// When control resumes at this point, a reply will have been received that
// indicates the broker has closed the channel successfully
- // we pass null since this is not an error case
- closeProducersAndConsumers(null);
}
catch (AMQException e)