activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: ARTEMIS-1305 Avoid deadlock when shutting down RA and reconnects
Date Fri, 28 Jul 2017 15:59:05 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x e1d6f6cb8 -> 8e7d4fb34


ARTEMIS-1305 Avoid deadlock when shutting down RA and reconnects

(cherry picked from commit 7adc8339c71621a9bd20f0632d5d0a7dfd652de3)


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

Branch: refs/heads/1.x
Commit: 8e7d4fb34ed681cdf76c8983e38280563d849b30
Parents: e1d6f6c
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Jul 28 11:53:09 2017 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Jul 28 11:58:58 2017 -0400

----------------------------------------------------------------------
 .../activemq/artemis/ra/ActiveMQRAManagedConnection.java     | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8e7d4fb3/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
index eee41cc..6d0759e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
@@ -221,14 +221,6 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection,
Exc
          ActiveMQRALogger.LOGGER.trace("destroyHandles()");
       }
 
-      try {
-         if (connection != null) {
-            connection.stop();
-         }
-      } catch (Throwable t) {
-         logger.trace("Ignored error stopping connection", t);
-      }
-
       for (ActiveMQRASession session : handles) {
          session.destroy();
       }


Mime
View raw message