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 2016/09/26 17:38:21 UTC

[1/2] activemq-artemis git commit: This closes #795

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 147bc33d4 -> 27ed7ec65


This closes #795


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

Branch: refs/heads/master
Commit: 27ed7ec659f9a8d8a626bb8c6ba4a588677e5685
Parents: 147bc33 f2c2ed3
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 26 13:38:08 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 26 13:38:08 2016 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/cluster/qourum/QuorumManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: Fix closing quorums on QuorumManager.stop

Posted by cl...@apache.org.
Fix closing quorums on QuorumManager.stop


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

Branch: refs/heads/master
Commit: f2c2ed32da7d380ad1f7422311fd3a14258c27a9
Parents: 147bc33
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sat Sep 24 14:48:36 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 26 13:38:08 2016 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/cluster/qourum/QuorumManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f2c2ed32/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
index 72bcb00..6b01b96 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
@@ -96,10 +96,10 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
             }
          }
       }
-      quorums.clear();
       for (Quorum quorum : quorums.values()) {
          quorum.close();
       }
+      quorums.clear();
    }
 
    /**