[1/2] activemq-artemis git commit: ARTEMIS-2197 Page deleted before transaction finishes

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: ARTEMIS-2197 Page deleted before transaction finishes

clebertsuconic-2
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3d1195455 -> c90d822fa


ARTEMIS-2197 Page deleted before transaction finishes

Fixed regression caused by previous commit
b36dc37c152cabe3a0d9af178db043f842bfcdc0


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

Branch: refs/heads/master
Commit: 2bd8fa7c5dcfb2c29a5c5f61ff433bf161b1b86e
Parents: 3d11954
Author: Howard Gao <[hidden email]>
Authored: Thu Dec 13 20:17:14 2018 +0800
Committer: Howard Gao <[hidden email]>
Committed: Thu Dec 13 20:18:31 2018 +0800

----------------------------------------------------------------------
 .../artemis/core/server/impl/RefsOperation.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2bd8fa7c/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
index cc31a04..3d8bdd6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java
@@ -132,16 +132,16 @@ public class RefsOperation extends TransactionOperationAbstract {
                message.incrementRefCount();
             }
             ackedTX.commit(true);
-
-            if (pagedMessagesToPostACK != null) {
-               for (MessageReference refmsg : pagedMessagesToPostACK) {
-                  ((PagedReference)refmsg).removePendingFlag();
-               }
-            }
          } catch (Exception e) {
             ActiveMQServerLogger.LOGGER.failedToProcessMessageReferenceAfterRollback(e);
          }
       }
+
+      if (pagedMessagesToPostACK != null) {
+         for (MessageReference refmsg : pagedMessagesToPostACK) {
+            ((PagedReference)refmsg).removePendingFlag();
+         }
+      }
    }
 
    protected void rollbackRedelivery(Transaction tx, MessageReference ref, long timeBase, Map<QueueImpl, LinkedList<MessageReference>> queueMap) throws Exception {

Reply | Threaded
Open this post in threaded view
|

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

clebertsuconic-2
This closes #2463


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

Branch: refs/heads/master
Commit: c90d822faca1c1f64666f84cf974cc2a8957f71b
Parents: 3d11954 2bd8fa7
Author: Clebert Suconic <[hidden email]>
Authored: Thu Dec 13 10:22:25 2018 -0500
Committer: Clebert Suconic <[hidden email]>
Committed: Thu Dec 13 10:22:25 2018 -0500

----------------------------------------------------------------------
 .../artemis/core/server/impl/RefsOperation.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------