qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-jms-amqp-0-x git commit: QPID-8212: [JMS AMQP 0-x][AMQP 0-8..0-91] Make sure that consumer close does not delay concurrent connection close
Date Thu, 05 Jul 2018 15:48:59 GMT
Repository: qpid-jms-amqp-0-x
Updated Branches:
  refs/heads/6.3.x c88fa5172 -> 242099b05


QPID-8212: [JMS AMQP 0-x][AMQP 0-8..0-91] Make sure that consumer close does not delay concurrent
connection close

(cherry picked from commit 22a4c4fc28f32e715d3852e303a2ed00e6770c44)


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/242099b0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/242099b0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/242099b0

Branch: refs/heads/6.3.x
Commit: 242099b05b78d2a8c8360df10619d066f509891e
Parents: c88fa51
Author: Alex Rudyy <orudyy@apache.org>
Authored: Tue Jun 26 11:23:46 2018 +0100
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Thu Jul 5 16:47:05 2018 +0100

----------------------------------------------------------------------
 client/src/main/java/org/apache/qpid/client/AMQSession.java     | 5 +++++
 .../org/apache/qpid/client/protocol/AMQProtocolSession.java     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/242099b0/client/src/main/java/org/apache/qpid/client/AMQSession.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/AMQSession.java b/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 5d97a8b..ffb01d8 100644
--- a/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -3751,6 +3751,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer,
P extends Basic
         return super.isClosed() || _connection.isClosed();
     }
 
+    public boolean isSessionClosed()
+    {
+        return super.isClosed();
+    }
+
     /**
      * Checks if the Session and its parent connection are capable of performing
      * closing operations

http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/242099b0/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 9b5c6a8..3986bb3 100644
--- a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -545,7 +545,7 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
     private boolean isClosedForInput(final int channelId)
     {
         AMQSession session;
-        return channelId > 0 && ((session = _connection.getSession(channelId))
== null || session.isClosed());
+        return channelId > 0 && ((session = _connection.getSession(channelId))
== null || session.isSessionClosed());
     }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message