You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/09/08 17:14:25 UTC

[1/2] activemq-artemis git commit: This closes #160 Closing Resource adapter conneciton factories

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 20006b6e9 -> 1a6c623cd


This closes #160 Closing Resource adapter conneciton factories


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

Branch: refs/heads/master
Commit: 1a6c623cdf9751a6c6b71e54909db3949d1a189c
Parents: 20006b6 c1aaa56
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Sep 8 11:14:08 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 8 11:14:08 2015 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: [ARTEMIS-220] Artemis RA does not close its connection factories when it is stopped.

Posted by cl...@apache.org.
[ARTEMIS-220] Artemis RA does not close its connection factories when it is stopped.

in stop(), close the knowConnectionFactories before clearing the collection.

JIRA: https://issues.apache.org/jira/browse/ARTEMIS-220


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

Branch: refs/heads/master
Commit: c1aaa562c830a60ed7f5c5feafd39f0f1fe6afcf
Parents: 20006b6
Author: Jeff Mesnil <jm...@gmail.com>
Authored: Tue Sep 8 16:46:57 2015 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 8 11:14:08 2015 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c1aaa562/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
index 62b51d4..24c659f 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
@@ -275,6 +275,9 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable {
 
       managedConnectionFactories.clear();
 
+      for (ActiveMQConnectionFactory knownConnectionFactory : knownConnectionFactories.values()) {
+         knownConnectionFactory.close();
+      }
       knownConnectionFactories.clear();
 
       if (defaultActiveMQConnectionFactory != null) {