Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 96A6D1853D for ; Mon, 18 Apr 2016 11:55:28 +0000 (UTC) Received: (qmail 95477 invoked by uid 500); 18 Apr 2016 11:55:28 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 95438 invoked by uid 500); 18 Apr 2016 11:55:28 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 95429 invoked by uid 99); 18 Apr 2016 11:55:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Apr 2016 11:55:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4EA44DFD43; Mon, 18 Apr 2016 11:55:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cshannon@apache.org To: commits@activemq.apache.org Message-Id: <626218ecc40144c6a713d7b9bed8c962@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-6222 Date: Mon, 18 Apr 2016 11:55:28 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/activemq-5.13.x 2f935a260 -> 9d545cf11 https://issues.apache.org/jira/browse/AMQ-6222 Reverting the change to move clearMarshalledState into the callback listener as beforeMarshall is now called before the async message add Revert 7f5c09f2d77c77f87a47fb738870c5ee5bc78c27 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9d545cf1 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9d545cf1 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9d545cf1 Branch: refs/heads/activemq-5.13.x Commit: 9d545cf11f2ed999d68da7b5a16e46adee095a08 Parents: 2f935a2 Author: Christopher L. Shannon (cshannon) Authored: Mon Apr 18 11:54:38 2016 +0000 Committer: Christopher L. Shannon (cshannon) Committed: Mon Apr 18 11:54:38 2016 +0000 ---------------------------------------------------------------------- .../apache/activemq/broker/region/Queue.java | 24 ++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/9d545cf1/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java index 9540a93..8e2943a 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java @@ -840,28 +840,14 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index //condition if the original add is processed after the update, which can cause //a duplicate message to be stored if (messages.isCacheEnabled() && !isPersistJMSRedelivered()) { - message.beforeMarshall(null); + message.beforeMarshall(null); result = store.asyncAddQueueMessage(context, message, isOptimizeStorage()); - final PendingMarshalUsageTracker tracker = new PendingMarshalUsageTracker(message); - result.addListener(new Runnable() { - @Override - public void run() { - //Execute usage tracker and then check isReduceMemoryFootprint() - tracker.run(); - if (isReduceMemoryFootprint()) { - try { - message.clearMarshalledState(); - } catch (JMSException e) { - throw new IllegalStateException(e); - } - } - } - }); + result.addListener(new PendingMarshalUsageTracker(message)); } else { store.addMessage(context, message); - if (isReduceMemoryFootprint()) { - message.clearMarshalledState(); - } + } + if (isReduceMemoryFootprint()) { + message.clearMarshalledState(); } } catch (Exception e) { // we may have a store in inconsistent state, so reset the cursor