activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-699 group ID reaper tx bug
Date Tue, 30 Aug 2016 21:27:55 GMT
ARTEMIS-699 group ID reaper tx bug


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

Branch: refs/heads/master
Commit: 68d1e980fcefc79ddcb4929ac549d9438785f342
Parents: 080397a
Author: jbertram <jbertram@apache.com>
Authored: Thu Aug 25 16:27:16 2016 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Aug 30 17:27:47 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/server/group/impl/LocalGroupingHandler.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68d1e980/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
index 9b2058c..60e9ae8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java
@@ -444,9 +444,9 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
{
                      storageManager.deleteGrouping(txID, groupBinding);
 
                      if (expiredGroups >= 1000 && txID >= 0) {
+                        storageManager.commitBindings(txID);
                         expiredGroups = 0;
                         txID = -1;
-                        storageManager.commitBindings(txID);
                      }
                   }
                   catch (Exception e) {


Mime
View raw message