QPID-5555 : fix breakage in the broker QMF plugin caused by rework to broker internals

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

4 files changed, 11 insertions, 6 deletions

diff --git a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
index 48c59ba476..fb91d7a4a3 100644
--- a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
@@ -231,9 +231,9 @@ public class QmfManagementAgent implements ConfigurationChangeListener, QmfEvent
                 {
                     childAdded(connection, session);
 
-                    if (session.getSubscriptions() != null)
+                    if (session.getConsumers() != null)
                     {
-                        for (Consumer subscription : session.getSubscriptions())
+                        for (Consumer subscription : session.getConsumers())
                         {
                             childAdded(session, subscription);
                         }
diff --git a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
index fda1b7ad84..3427708276 100644
--- a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.qmf2.agentdata;
 
 // Misc Imports
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 // Simple Logging Facade 4 Java
@@ -563,8 +564,12 @@ System.out.println("properties = " + properties);
 
                             // I don't *think* that it make sense to allow setting exclusive or autoDelete to
                             // a queue created from config.
-                            Queue queue = vhost.createQueue(nameParser.getQueueName(), State.ACTIVE, durable, false,
-                                                            LifetimePolicy.PERMANENT, 0l, properties);
+                            Map<String,Object> attributes = new HashMap<String,Object>(properties);
+                            attributes.put(Queue.NAME, nameParser.getQueueName());
+                            attributes.put(Queue.DURABLE, durable);
+                            attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
+
+                            Queue queue = vhost.createQueue(attributes);
 
                             // Set the queue's alternateExchange, which is just a little bit involved......
                             // The queue.setAttribute() method needs an org.apache.qpid.server.model.Exchange instance
diff --git a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
index 1f46daf99b..7b399e593f 100644
--- a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
@@ -135,7 +135,7 @@ public class Exchange extends QmfAgentData
         }
 
         LifetimePolicy lifetimePolicy = (LifetimePolicy)_exchange.getAttribute("lifetimePolicy");
-        boolean autoDelete = (lifetimePolicy == LifetimePolicy.AUTO_DELETE) ? true : false;
+        boolean autoDelete = (lifetimePolicy != LifetimePolicy.PERMANENT) ? true : false;
 
         // TODO vhostRef - currently just use its name to try and get things working with standard command line tools.
 
diff --git a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
index 5cbe873769..1797979de6 100644
--- a/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
+++ b/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
@@ -141,7 +141,7 @@ public class Queue extends QmfAgentData
         }
 
         LifetimePolicy lifetimePolicy = (LifetimePolicy)_queue.getAttribute("lifetimePolicy");
-        boolean autoDelete = (lifetimePolicy == LifetimePolicy.AUTO_DELETE) ? true : false;
+        boolean autoDelete = (lifetimePolicy != LifetimePolicy.PERMANENT) ? true : false;
 
         // TODO vhostRef - currently just use its name to try and get things working with standard command line tools.