summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2008-10-15 14:34:32 +0000
committerAidan Skinner <aidan@apache.org>2008-10-15 14:34:32 +0000
commit3de95a81342b12b59463d10c7b184a54c8677aec (patch)
tree6653ca12f0c22e09539416ab539b66458bdecc01 /qpid/java
parent5fd9c10b439c33fcd3a15ec101f903abbeeb5ab0 (diff)
downloadqpid-python-3de95a81342b12b59463d10c7b184a54c8677aec.tar.gz
QPID-1356: move commit even higher, before the auth check.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704928 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java8
1 files changed, 4 insertions, 4 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 896747fc83..b994040131 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
@@ -173,6 +173,10 @@ public class IncomingMessage implements Filterable<RuntimeException>
message.setExpiration(_expiration);
message.setClientIdentifier(_publisher.getSessionIdentifier());
+ // 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());
+
AMQShortString userID = getContentHeaderBody().properties instanceof BasicContentHeaderProperties ?
((BasicContentHeaderProperties) getContentHeaderBody().properties).getUserId() : null;
@@ -181,10 +185,6 @@ 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)
{