summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
index 2adedea8e0..d750ee7f72 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
@@ -135,6 +135,7 @@ public class LocalTransactionalContext implements TransactionalContext
//we will need to create and enlist the op.
if (_ackOp == null)
{
+ beginTranIfNecessary();
_ackOp = new TxAck(unacknowledgedMessageMap);
_txnBuffer.enlist(_ackOp);
}
@@ -182,6 +183,8 @@ public class LocalTransactionalContext implements TransactionalContext
}
if (_ackOp != null)
{
+
+ _messageDelivered = true;
_ackOp.consolidate();
//already enlisted, after commit will reset regardless of outcome
_ackOp = null;