diff options
author | Aidan Skinner <aidan@apache.org> | 2008-05-16 16:05:49 +0000 |
---|---|---|
committer | Aidan Skinner <aidan@apache.org> | 2008-05-16 16:05:49 +0000 |
commit | aaf75467dcd1a1531f5dfa45e2af7b289d4f49f3 (patch) | |
tree | dff53fef4b4b0a458bfde8cf35ee734dc4af5133 | |
parent | 2360f1b87fbe721f71e6a63065c489ca552c9b0c (diff) | |
download | qpid-python-aaf75467dcd1a1531f5dfa45e2af7b289d4f49f3.tar.gz |
Merged revisions 657111 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x
................
r657111 | aidan | 2008-05-16 16:53:21 +0100 (Fri, 16 May 2008) | 9 lines
Merged revisions 657097 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r657097 | rgodfrey | 2008-05-16 16:08:55 +0100 (Fri, 16 May 2008) | 1 line
QPID-1060 : Release ref to transient meta data; cache message size
........
................
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@657116 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java | 33 | ||||
-rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java | 12 |
2 files changed, 22 insertions, 23 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java index f501bc27d1..a76b13ce74 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java @@ -89,6 +89,11 @@ public class AMQMessage private static final boolean SYNCED_CLOCKS = ApplicationRegistry.getInstance().getConfiguration().getBoolean("advanced.synced-clocks", false); + private static final long UNKNOWN_SIZE = Long.MIN_VALUE; + + private long _size = UNKNOWN_SIZE; + + public String debugIdentity() { @@ -255,7 +260,6 @@ public class AMQMessage _txnContext = txnContext; _immediate = info.isImmediate(); _transientMessageData.setMessagePublishInfo(info); - } /** @@ -276,6 +280,7 @@ public class AMQMessage _messageHandle = factory.createMessageHandle(messageId, store, true); _txnContext = txnConext; _transientMessageData = null; + } /** @@ -352,6 +357,7 @@ public class AMQMessage public void setContentHeaderBody(ContentHeaderBody contentHeaderBody) throws AMQException { _transientMessageData.setContentHeaderBody(contentHeaderBody); + _size = _transientMessageData.getContentHeaderBody().bodySize; } public void routingComplete(MessageStore store, StoreContext storeContext, MessageHandleFactory factory) @@ -376,6 +382,8 @@ public class AMQMessage { deliver(storeContext); } + + } public boolean addContentBodyFrame(StoreContext storeContext, ContentChunk contentChunk) throws AMQException @@ -670,6 +678,7 @@ public class AMQMessage // Remove refence for routing process . Reference count should now == delivered queue count decrementReference(storeContext); + _transientMessageData = null; } } @@ -681,19 +690,19 @@ public class AMQMessage public long getSize() { - try + if(_size == UNKNOWN_SIZE) { - long size = getContentHeaderBody().bodySize; - - return size; - } - catch (AMQException e) - { - _log.error(e.toString(), e); - - return 0; + try + { + _size = getContentHeaderBody().bodySize; + } + catch (AMQException e) + { + _log.warn("Unable to retrieve message meta data for message:" + this, e); + return 0; + } } - + return _size; } public void restoreTransientMessageData() throws AMQException diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java index 6f9efd3200..a57a5d41d0 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java @@ -46,17 +46,7 @@ public enum NotificationCheck final long maximumMessageSize = queue.getMaximumMessageSize();
if(maximumMessageSize != 0)
{
- // Check for threshold message size
- long messageSize;
- try
- {
- messageSize = (msg == null) ? 0 : msg.getContentHeaderBody().bodySize;
- }
- catch (AMQException e)
- {
- messageSize = 0;
- }
-
+ long messageSize = (msg == null) ? 0 : msg.getSize();
if (messageSize >= maximumMessageSize)
{
|