QPID-949 : renamed _disabled to _disableFlowtoDisk based on review feedback

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

2 files changed, 11 insertions, 11 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java b/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java
index 5e5901bcd7..4b387eac53 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/FlowableBaseQueueEntryList.java
@@ -51,7 +51,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
     private Executor _purger;
     private AtomicBoolean _stopped;
     private AtomicReference<MessageInhaler> _asynchronousInhaler = new AtomicReference(null);
-    protected boolean _disabled;
+    protected boolean _disableFlowToDisk;
     private AtomicReference<MessagePurger> _asynchronousPurger = new AtomicReference(null);
     private static final int BATCH_PROCESS_COUNT = 100;
 
@@ -68,7 +68,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
         _stopped = new AtomicBoolean(false);
         _inhaler = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
         _purger = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
-        _disabled = true;
+        _disableFlowToDisk = true;
     }
 
     public void setFlowed(boolean flowed)
@@ -121,7 +121,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
 
         if (maximumMemoryUsage >= 0)
         {
-            _disabled = false;
+            _disableFlowToDisk = false;
         }
 
         // Don't attempt to start the inhaler/purger unless we have a minimum value specified.
@@ -142,7 +142,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
             {
                 _log.info("Disabling Flow to Disk for queue:" + _queue.getName());
             }
-            _disabled = true;
+            _disableFlowToDisk = true;
         }
     }
 
@@ -166,7 +166,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
     {
         // If we've increased the minimum memory above what we have in memory then
         // we need to inhale more if there is more
-        if (!_disabled && _atomicQueueInMemory.get() < _memoryUsageMinimum && _atomicQueueSize.get() > 0)
+        if (!_disableFlowToDisk && _atomicQueueInMemory.get() < _memoryUsageMinimum && _atomicQueueSize.get() > 0)
         {
             startInhaler();
         }
@@ -204,7 +204,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
      */
     public void entryUnloadedUpdateMemory(QueueEntry queueEntry)
     {
-        if (!_disabled && _atomicQueueInMemory.addAndGet(-queueEntry.getSize()) < 0)
+        if (!_disableFlowToDisk && _atomicQueueInMemory.addAndGet(-queueEntry.getSize()) < 0)
         {
             _log.error("InMemory Count just went below 0:" + queueEntry.debugIdentity());
         }
@@ -219,7 +219,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
      */
     public void entryLoadedUpdateMemory(QueueEntry queueEntry)
     {
-        if (!_disabled && _atomicQueueInMemory.addAndGet(queueEntry.getSize()) > _memoryUsageMaximum)
+        if (!_disableFlowToDisk && _atomicQueueInMemory.addAndGet(queueEntry.getSize()) > _memoryUsageMaximum)
         {
             _log.error("Loaded to much data!:" + _atomicQueueInMemory.get() + "/" + _memoryUsageMaximum);
             setFlowed(true);
@@ -247,7 +247,7 @@ public abstract class FlowableBaseQueueEntryList implements QueueEntryList
         _atomicQueueSize.addAndGet(queueEntry.getSize());
         long inUseMemory = _atomicQueueInMemory.addAndGet(queueEntry.getSize());
 
-        if (!_disabled && inUseMemory > _memoryUsageMaximum)
+        if (!_disableFlowToDisk && inUseMemory > _memoryUsageMaximum)
         {
             setFlowed(true);
             queueEntry.unload();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java b/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
index d5271295dd..fc11dd888a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
@@ -68,7 +68,7 @@ public class PriorityQueueEntryList extends FlowableBaseQueueEntryList implement
 
         long requriedSize = message.getSize();
         // Check and see if list would flow on adding message
-        if (!_disabled && !isFlowed() && _priorityLists[index].memoryUsed() + requriedSize > _priorityLists[index].getMemoryUsageMaximum())
+        if (!_disableFlowToDisk && !isFlowed() && _priorityLists[index].memoryUsed() + requriedSize > _priorityLists[index].getMemoryUsageMaximum())
         {
             if (_log.isDebugEnabled())
             {
@@ -401,7 +401,7 @@ public class PriorityQueueEntryList extends FlowableBaseQueueEntryList implement
 
         if (maximumMemoryUsage >= 0)
         {
-            _disabled = false;
+            _disableFlowToDisk = false;
         }
 
         long share = maximumMemoryUsage / _priorities;
@@ -418,7 +418,7 @@ public class PriorityQueueEntryList extends FlowableBaseQueueEntryList implement
             {
                 _log.info("Disabling Flow to Disk for queue:" + _queue.getName());
             }
-            _disabled = true;
+            _disableFlowToDisk = true;
             return;
         }