activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-5710 - connection cleanup should not remove connection from the broker
Date Tue, 07 Apr 2015 15:22:13 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 25c99a6c3 -> c705523cd


https://issues.apache.org/jira/browse/AMQ-5710 - connection cleanup should not remove connection
from the broker


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c705523c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c705523c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c705523c

Branch: refs/heads/master
Commit: c705523cd047fcdd6231cb936abc4ef5b4cf5816
Parents: 25c99a6
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Tue Apr 7 17:21:47 2015 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Tue Apr 7 17:21:59 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/ActiveMQConnection.java    | 8 +-------
 .../org/apache/activemq/ra/ActiveMQManagedConnection.java    | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/c705523c/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 51122ca..d87118d 100755
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -1587,19 +1587,13 @@ public class ActiveMQConnection implements Connection, TopicConnection,
QueueCon
             c.dispose();
         }
 
-        if (isConnectionInfoSentToBroker) {
-            if (!transportFailed.get() && !closing.get()) {
-                syncSendPacket(info.createRemoveCommand());
-            }
-            isConnectionInfoSentToBroker = false;
-        }
         if (userSpecifiedClientID) {
             info.setClientId(null);
             userSpecifiedClientID = false;
         }
         clientIDSet = false;
 
-        started.set(false);
+        stop();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/activemq/blob/c705523c/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 0b67613..45e7028 100755
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
@@ -234,7 +234,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
         try {
             physicalConnection.cleanup();
         } catch (JMSException e) {
-            throw new ResourceException("Could cleanup the ActiveMQ connection: " + e, e);
+            throw new ResourceException("Could not cleanup the ActiveMQ connection: " + e,
e);
         } finally {
             // defer transaction cleanup till after close so that close is aware of the current
tx
             localAndXATransaction.cleanup();


Mime
View raw message