QPID-1144 : Reference count drops to zero too early for immediate messages in a txn

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@669841 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 3 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 ad8303ec5d..3c71282c57 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
@@ -93,11 +93,19 @@ public class LocalTransactionalContext implements TransactionalContext
         public void process() throws AMQException
         {
 
-            QueueEntry entry = _queue.enqueue(getStoreContext(),_message);
+            _message.incrementReference();
+            try
+            {
+                QueueEntry entry = _queue.enqueue(getStoreContext(),_message);
 
-            if(entry.immediateAndNotDelivered())
+                if(entry.immediateAndNotDelivered())
+                {
+                    getReturnMessages().add(new NoConsumersException(_message));
+                }
+            }
+            finally
             {
-                getReturnMessages().add(new NoConsumersException(_message));
+                _message.decrementReference(getStoreContext());
             }
         }
     }