1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 18269fa5e8..34e35171e5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
@@ -1352,7 +1352,10 @@ public class DerbyMessageStore implements MessageStore
 
         public void process() throws AMQException
         {
-            _queue.enqueue(_context, _message);
+            StoreContext.setCurrentContext(_context);
+            _queue.enqueue(_message);
+            StoreContext.clearCurrentContext();
+
 
         }
 
@@ -1414,7 +1417,7 @@ public class DerbyMessageStore implements MessageStore
 
                 if(message != null)
                 {
-                    message.incrementReference();
+//                    message.incrementReference();
                 }
                 else
                 {