diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:25:00 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:25:00 +0000 |
commit | 19478e74524f27e26f01117b1b973829718ed44d (patch) | |
tree | 214cee6e0e1fb25a553aaaa490b775450ea9e8e2 /qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java | |
parent | e0e8f4c5087c1c5dc787740d6bd862755bd8daf1 (diff) | |
download | qpid-python-19478e74524f27e26f01117b1b973829718ed44d.tar.gz |
Merging from trunk r1618230:1618433 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620344 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java')
-rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java index 22ea1d9706..a943c0f54c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java @@ -87,6 +87,6 @@ public enum Protocol public static enum ProtocolType { - AMQP, HTTP, JMX, RMI; + AMQP, HTTP, JMX, RMI } } |