Repository: activemq Updated Branches: refs/heads/master 365c1bbe9 -> 09bf8f89b
AMQ-6707 - ensure trace logging does not flip cacheEnabled flag outside required sync Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/09bf8f89 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/09bf8f89 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/09bf8f89 Branch: refs/heads/master Commit: 09bf8f89b882fc71fff1dc46ea4991df6a23f64d Parents: 365c1bb Author: gtully <[email protected]> Authored: Tue May 15 12:00:22 2018 +0100 Committer: gtully <[email protected]> Committed: Tue May 15 12:00:22 2018 +0100 ---------------------------------------------------------------------- .../broker/region/cursors/AbstractPendingMessageCursor.java | 2 +- .../apache/activemq/broker/region/cursors/AbstractStoreCursor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/09bf8f89/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java index 2c78ae3..8a1587b 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java @@ -45,7 +45,7 @@ public abstract class AbstractPendingMessageCursor implements PendingMessageCurs protected boolean enableAudit=true; protected ActiveMQMessageAudit audit; protected boolean useCache=true; - private boolean cacheEnabled=true; + protected boolean cacheEnabled=true; private boolean started=false; protected MessageReference last = null; protected final boolean prioritizedMessages; http://git-wip-us.apache.org/repos/asf/activemq/blob/09bf8f89/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java index 03b412f..8b910bf 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java @@ -490,7 +490,7 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i @Override public String toString() { return super.toString() + ":" + regionDestination.getActiveMQDestination().getPhysicalName() + ",batchResetNeeded=" + batchResetNeeded - + ",size=" + this.size + ",cacheEnabled=" + isCacheEnabled() + + ",size=" + this.size + ",cacheEnabled=" + cacheEnabled + ",maxBatchSize:" + maxBatchSize + ",hasSpace:" + hasSpace() + ",pendingCachedIds.size:" + pendingCachedIds.size() + ",lastSyncCachedId:" + lastCachedIds[SYNC_ADD] + ",lastSyncCachedId-seq:" + (lastCachedIds[SYNC_ADD] != null ? lastCachedIds[SYNC_ADD].getFutureOrSequenceLong() : "null") + ",lastAsyncCachedId:" + lastCachedIds[ASYNC_ADD] + ",lastAsyncCachedId-seq:" + (lastCachedIds[ASYNC_ADD] != null ? lastCachedIds[ASYNC_ADD].getFutureOrSequenceLong() : "null");
