From d7028167ca5314f3bea293f9aedc24254a218b6c Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Wed, 18 Mar 2015 15:47:55 +0000
Subject: QPID-6458: [Java Client] Prevent the client sending channel.flow (or
 message.stop) after the session has been closed by the client

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1667578 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/client/src/main/java/org/apache/qpid/client/AMQSession.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

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 3966e75423..6c43396481 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
@@ -2425,7 +2425,10 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
     void stop() throws AMQException
     {
         // Stop the server delivering messages to this session.
-        suspendChannel(true);
+        if (!(isClosed() || isClosing()))
+        {
+            suspendChannel(true);
+        }
 
         if (_dispatcher != null)
         {
-- 
cgit v1.2.1