summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:31:34 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:31:34 +0000
commitf9592e0d891b2eca8b91e06e6da0f8cd6c15f24c (patch)
treec99af5d88f0e88eb52281efd9cf6ea2ded45c879 /qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
parent9556a8d9c53be396a25cd4c29842b79e99bc1746 (diff)
downloadqpid-python-f9592e0d891b2eca8b91e06e6da0f8cd6c15f24c.tar.gz
Merging from trunk r1618840:1619054 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620349 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
index ac691c0860..a235613c29 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
@@ -48,12 +48,6 @@ public class JmxPortImpl extends AbstractPortWithAuthProvider<JmxPortImpl> imple
}
@Override
- protected Set<Protocol> getDefaultProtocols()
- {
- return Collections.singleton(Protocol.JMX_RMI);
- }
-
- @Override
public void setPortManager(PortManager manager)
{
_portManager = manager;