QPID-1356: Write message to disk before delivering it to queues.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
index fc96aa901a..896747fc83 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
@@ -181,6 +181,10 @@ public class IncomingMessage implements Filterable<RuntimeException>
                 throw new UnauthorizedAccessException("Acccess Refused",message);
             }
             
+            // we then allow the transactional context to do something with the message content
+            // now that it has all been received, before we attempt delivery
+            _txnContext.messageFullyReceived(isPersistent());
+            
             if ((_destinationQueues == null) || _destinationQueues.size() == 0)
             {
 
@@ -223,9 +227,6 @@ public class IncomingMessage implements Filterable<RuntimeException>
                 }
             }
 
-            // we then allow the transactional context to do something with the message content
-            // now that it has all been received, before we attempt delivery
-            _txnContext.messageFullyReceived(isPersistent());
             message.clearStoreContext();
             return message;
         }