You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/16 16:04:40 UTC
svn commit: r1770008 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue:
QueueConsumerManagerImpl.java QueueConsumerNode.java
Author: rgodfrey
Date: Wed Nov 16 16:04:40 2016
New Revision: 1770008
URL: http://svn.apache.org/viewvc?rev=1770008&view=rev
Log:
QPID-7514 : Use constants for EnumSets rather than creating a new instance on each invocation
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java?rev=1770008&r1=1770007&r2=1770008&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java Wed Nov 16 16:04:40 2016
@@ -29,6 +29,16 @@ import java.util.concurrent.CopyOnWriteA
public class QueueConsumerManagerImpl implements QueueConsumerManager
{
+ private static final EnumSet<NodeState> REMOVED = EnumSet.of(NodeState.REMOVED);
+ private static final EnumSet<NodeState> STATES_OTHER_THAN_REMOVED =
+ EnumSet.complementOf(REMOVED);
+ private static final EnumSet<NodeState> NOT_INTERESTED = EnumSet.of(NodeState.NOT_INTERESTED);
+ private static final EnumSet<NodeState>
+ EITHER_INTERESTED_OR_NOTIFIED = EnumSet.of(NodeState.INTERESTED, NodeState.NOTIFIED);
+ private static final EnumSet<NodeState> NON_ACQUIRING = EnumSet.of(NodeState.NON_ACQUIRING);
+ private static final EnumSet<NodeState> INTERESTED = EnumSet.of(NodeState.INTERESTED);
+ private static final EnumSet<NodeState> NOTIFIED = EnumSet.of(NodeState.NOTIFIED);
+
private final AbstractQueue<?> _queue;
private final List<PriorityConsumerListPair> _interested;
@@ -71,16 +81,16 @@ public class QueueConsumerManagerImpl im
{
if (consumer.acquires())
{
- node.moveFromTo(NodeState.REMOVED, NodeState.INTERESTED);
+ node.moveFromTo(REMOVED, NodeState.INTERESTED);
}
else
{
- node.moveFromTo(NodeState.REMOVED, NodeState.NON_ACQUIRING);
+ node.moveFromTo(REMOVED, NodeState.NON_ACQUIRING);
}
}
else
{
- node.moveFromTo(NodeState.REMOVED, NodeState.NOT_INTERESTED);
+ node.moveFromTo(REMOVED, NodeState.NOT_INTERESTED);
}
_count++;
}
@@ -92,7 +102,7 @@ public class QueueConsumerManagerImpl im
removeFromAll(consumer);
QueueConsumerNode node = consumer.getQueueConsumerNode();
- if (node.moveFromTo(EnumSet.complementOf(EnumSet.of(NodeState.REMOVED)), NodeState.REMOVED))
+ if (node.moveFromTo(STATES_OTHER_THAN_REMOVED, NodeState.REMOVED))
{
_count--;
return true;
@@ -109,22 +119,22 @@ public class QueueConsumerManagerImpl im
{
if (consumer.acquires())
{
- return node.moveFromTo(NodeState.NOT_INTERESTED, NodeState.INTERESTED);
+ return node.moveFromTo(NOT_INTERESTED, NodeState.INTERESTED);
}
else
{
- return node.moveFromTo(NodeState.NOT_INTERESTED, NodeState.NON_ACQUIRING);
+ return node.moveFromTo(NOT_INTERESTED, NodeState.NON_ACQUIRING);
}
}
else
{
if (consumer.acquires())
{
- return node.moveFromTo(EnumSet.of(NodeState.INTERESTED, NodeState.NOTIFIED), NodeState.NOT_INTERESTED);
+ return node.moveFromTo(EITHER_INTERESTED_OR_NOTIFIED, NodeState.NOT_INTERESTED);
}
else
{
- return node.moveFromTo(EnumSet.of(NodeState.NON_ACQUIRING), NodeState.NOT_INTERESTED);
+ return node.moveFromTo(NON_ACQUIRING, NodeState.NOT_INTERESTED);
}
}
}
@@ -138,11 +148,11 @@ public class QueueConsumerManagerImpl im
{
if (notified)
{
- return node.moveFromTo(NodeState.INTERESTED, NodeState.NOTIFIED);
+ return node.moveFromTo(INTERESTED, NodeState.NOTIFIED);
}
else
{
- return node.moveFromTo(NodeState.NOTIFIED, NodeState.INTERESTED);
+ return node.moveFromTo(NOTIFIED, NodeState.INTERESTED);
}
}
else
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java?rev=1770008&r1=1770007&r2=1770008&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java Wed Nov 16 16:04:40 2016
@@ -21,7 +21,6 @@
package org.apache.qpid.server.queue;
import java.util.Collection;
-import java.util.EnumSet;
final class QueueConsumerNode
{
@@ -42,11 +41,6 @@ final class QueueConsumerNode
return _queueConsumer;
}
- public boolean moveFromTo(QueueConsumerManagerImpl.NodeState fromState, QueueConsumerManagerImpl.NodeState toState)
- {
- return moveFromTo(EnumSet.of(fromState), toState);
- }
-
public QueueConsumerManagerImpl.NodeState getState()
{
return _state;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org