summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-19 13:09:38 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-19 13:09:38 +0000
commit8abe5e8a34bda4a1fd1703b597b75a9c57ae8316 (patch)
tree1cdf1e2d933a89c440028da241f211d34167d86e /qpid/java/broker-plugins
parentdb2daee6568f8292a23d4bfc82c8a40be9979ffd (diff)
downloadqpid-python-8abe5e8a34bda4a1fd1703b597b75a9c57ae8316.tar.gz
QPID-6010 : [Java Broker] Remove unnecessary system properties for controlling which AMQP protocols are made available
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618858 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java2
-rw-r--r--qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index d29144f09b..f55b373119 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -441,7 +441,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
Collection<Port<?>> httpPorts = new HashSet<>();
for (Port<?> port : ports)
{
- if (port.getAvailableProtocols().contains(Protocol.HTTP))
+ if (port.getProtocols().contains(Protocol.HTTP))
{
httpPorts.add(port);
}
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
index ead6ba6865..98c6d9ffe8 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
@@ -184,12 +184,12 @@ public class JMXManagementPluginImpl
private boolean isConnectorPort(Port<?> port)
{
- return port.getAvailableProtocols().contains(Protocol.JMX_RMI);
+ return port.getProtocols().contains(Protocol.JMX_RMI);
}
private boolean isRegistryPort(Port<?> port)
{
- return port.getAvailableProtocols().contains(Protocol.RMI);
+ return port.getProtocols().contains(Protocol.RMI);
}
@Override