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/08/25 18:03:51 UTC

svn commit: r1620361 - in /qpid/branches/0.30/qpid/tools/src/java: ./ qpid-broker-plugins-management-qmf2/src/main/java/ qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java

Author: rgodfrey
Date: Mon Aug 25 16:03:51 2014
New Revision: 1620361

URL: http://svn.apache.org/r1620361
Log:
Merge r1619137 from trunk to address QPID-6024

Modified:
    qpid/branches/0.30/qpid/tools/src/java/   (props changed)
    qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/   (props changed)
    qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java

Propchange: qpid/branches/0.30/qpid/tools/src/java/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/tools/src/java:r1619137

Propchange: qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java:r1619137

Modified: qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java?rev=1620361&r1=1620360&r2=1620361&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java (original)
+++ qpid/branches/0.30/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java Mon Aug 25 16:03:51 2014
@@ -364,7 +364,8 @@ public class Broker extends QmfAgentData
         {
             boolean isAMQP = false;
             boolean isTCP  = false;
-            for (Protocol protocol : port.getAvailableProtocols())
+
+            for (Protocol protocol : port.getProtocols())
             {
                 isAMQP = protocol.isAMQP();
                 if (isAMQP)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org