You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/05/04 10:08:48 UTC
activemq git commit: [AMQ-6068] make full cleanup of the rar managed
connection conditional on a user specified client id being present
Repository: activemq
Updated Branches:
refs/heads/master 2b3f0e595 -> 2bd337993
[AMQ-6068] make full cleanup of the rar managed connection conditional on a user specified client id being present
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2bd33799
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2bd33799
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2bd33799
Branch: refs/heads/master
Commit: 2bd337993285d83549fdb9d9f9b96712bb6fed69
Parents: 2b3f0e5
Author: gtully <ga...@gmail.com>
Authored: Thu May 4 11:08:32 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu May 4 11:08:32 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/ActiveMQConnection.java | 4 ++++
.../java/org/apache/activemq/ra/ActiveMQManagedConnection.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2bd33799/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
index b55f411..9f12344 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -1555,6 +1555,10 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
doCleanup(false);
}
+ public boolean isUserSpecifiedClientID() {
+ return userSpecifiedClientID;
+ }
+
public void doCleanup(boolean removeConnection) throws JMSException {
if (advisoryConsumer != null && !isTransportFailed()) {
advisoryConsumer.dispose();
http://git-wip-us.apache.org/repos/asf/activemq/blob/2bd33799/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
----------------------------------------------------------------------
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
index 85c947c..277cc45 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
@@ -232,7 +232,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
proxyConnections.clear();
try {
- physicalConnection.doCleanup(true);
+ physicalConnection.doCleanup(physicalConnection.isUserSpecifiedClientID());
} catch (JMSException e) {
throw new ResourceException("Could not cleanup the ActiveMQ connection: " + e, e);
} finally {