Author: rgodfrey
Date: Thu Apr 24 17:23:31 2014
New Revision: 1589798
URL: http://svn.apache.org/r1589798
Log:
QPID-5698 : [Java Broker] fix broken implementation of queue automated/derived
attributes
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=1589798&r1=1589797&r2=1589798&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
Thu Apr 24 17:23:31 2014
@@ -112,8 +112,6 @@ public interface AMQQueue<X extends AMQQ
void visit(QueueEntryVisitor visitor);
- boolean isOverfull();
-
long clearQueue();
/**
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1589798&r1=1589797&r2=1589798&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu Apr 24 17:23:31 2014
@@ -546,31 +546,10 @@ public abstract class AbstractQueue<X ex
@Override
public Object getAttribute(String name)
{
- if(ALTERNATE_EXCHANGE.equals(name))
- {
- return getAlternateExchange();
- }
- else if(OWNER.equals(name))
- {
- return getOwner();
- }
- else if(MESSAGE_GROUP_SHARED_GROUPS.equals(name))
- {
- //We only return the boolean value if message groups are actually
in use
- return _arguments.get(MESSAGE_GROUP_KEY) == null ? null :
_arguments.get(MESSAGE_GROUP_SHARED_GROUPS);
- }
- else if(QUEUE_FLOW_STOPPED.equals(name))
- {
- return isOverfull();
- }
- else if(STATE.equals(name))
+ if(STATE.equals(name))
{
return State.ACTIVE; // TODO
}
- else if (DESCRIPTION.equals(name))
- {
- return getDescription();
- }
return super.getAttribute(name);
}
@@ -2151,11 +2130,6 @@ public abstract class AbstractQueue<X ex
return _queueFlowResumeSizeBytes;
}
- public boolean isOverfull()
- {
- return _overfull.get();
- }
-
public Set<NotificationCheck> getNotificationChecks()
{
return _notificationChecks;
@@ -2648,7 +2622,7 @@ public abstract class AbstractQueue<X ex
@Override
public boolean isQueueFlowStopped()
{
- return false;
+ return _overfull.get();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
