QPID-5698 : [Java Broker] fix broken implementation of queue automated/derived attributes

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

2 files changed, 2 insertions, 30 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index e31eac77b4..f516013c2d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -112,8 +112,6 @@ public interface AMQQueue<X extends AMQQueue<X>>
 
     void visit(QueueEntryVisitor visitor);
 
-    boolean isOverfull();
-
     long clearQueue();
 
     /**
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 69c430e74c..0e04329a95 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -546,31 +546,10 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
     @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 extends AbstractQueue<X>>
         return _queueFlowResumeSizeBytes;
     }
 
-    public boolean isOverfull()
-    {
-        return _overfull.get();
-    }
-
     public Set<NotificationCheck> getNotificationChecks()
     {
         return _notificationChecks;
@@ -2648,7 +2622,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
     @Override
     public boolean isQueueFlowStopped()
     {
-        return false;
+        return _overfull.get();
     }
 
     @Override