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 2014/02/18 22:06:14 UTC
svn commit: r1569525 - in
/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2:
QmfManagementAgent.java agentdata/Broker.java agentdata/Exchange.java
agentdata/Queue.java
Author: rgodfrey
Date: Tue Feb 18 21:06:13 2014
New Revision: 1569525
URL: http://svn.apache.org/r1569525
Log:
QPID-5555 : fix breakage in the broker QMF plugin caused by rework to broker internals
Modified:
qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
Modified: qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java?rev=1569525&r1=1569524&r2=1569525&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java (original)
+++ qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java Tue Feb 18 21:06:13 2014
@@ -231,9 +231,9 @@ public class QmfManagementAgent implemen
{
childAdded(connection, session);
- if (session.getSubscriptions() != null)
+ if (session.getConsumers() != null)
{
- for (Consumer subscription : session.getSubscriptions())
+ for (Consumer subscription : session.getConsumers())
{
childAdded(session, subscription);
}
Modified: qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java?rev=1569525&r1=1569524&r2=1569525&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java (original)
+++ qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Broker.java Tue Feb 18 21:06:13 2014
@@ -23,6 +23,7 @@ package org.apache.qpid.server.qmf2.agen
// 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 = " + pro
// 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
Modified: qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java?rev=1569525&r1=1569524&r2=1569525&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java (original)
+++ qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java Tue Feb 18 21:06:13 2014
@@ -135,7 +135,7 @@ public class Exchange extends QmfAgentDa
}
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.
Modified: qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java?rev=1569525&r1=1569524&r2=1569525&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java (original)
+++ qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/Queue.java Tue Feb 18 21:06:13 2014
@@ -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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org