diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 20:31:19 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 20:31:19 +0000 |
| commit | 9e0e8ef7be2cd693d64d8c3d718a4cfab6bda789 (patch) | |
| tree | 0a723be9c19311d5a07d434c95ca252004f3198c /qpid/java/broker-plugins | |
| parent | e5fc53bbfabfe2b2835dc48fea1c559295b2bacf (diff) | |
| download | qpid-python-9e0e8ef7be2cd693d64d8c3d718a4cfab6bda789.tar.gz | |
QPID-5581 : [Java Broker] rename SimpleAMQQueue to AbstractQueue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1571086 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index c03daf20b3..8caf4b3ab5 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -926,7 +926,7 @@ public class ServerSessionDelegate extends SessionDelegate { exception(session, method, ExecutionErrorCode.NOT_FOUND, "Exchange: '" + method.getExchange() + "' not found"); } - else if(exchange.getType().equals(HeadersExchange.TYPE) && (!method.hasArguments() || method.getArguments() == null || !method.getArguments().containsKey("x-match"))) + else if(exchange.getExchangeType().equals(HeadersExchange.TYPE) && (!method.hasArguments() || method.getArguments() == null || !method.getArguments().containsKey("x-match"))) { exception(session, method, ExecutionErrorCode.INTERNAL_ERROR, "Bindings to an exchange of type " + HeadersExchange.TYPE.getType() + " require an x-match header"); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java index 8eb6c63542..78278b09c8 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java @@ -119,7 +119,7 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody> if (!exch.isBound(bindingKey, arguments, queue)) { - if(!exch.addBinding(bindingKey, queue, arguments) && TopicExchange.TYPE.equals(exch.getType())) + if(!exch.addBinding(bindingKey, queue, arguments) && TopicExchange.TYPE.equals(exch.getExchangeType())) { Binding oldBinding = exch.getBinding(bindingKey, queue, arguments); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java index f757137cf1..5d9cd4b80a 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java @@ -249,7 +249,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS { if(!hasBindingFilter && entry.getValue() instanceof ExactSubjectFilter - && exchange.getType() == DirectExchange.TYPE) + && exchange.getExchangeType() == DirectExchange.TYPE) { ExactSubjectFilter filter = (ExactSubjectFilter) filters.values().iterator().next(); source.setFilter(filters); @@ -259,7 +259,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS } else if(!hasBindingFilter && entry.getValue() instanceof MatchingSubjectFilter - && exchange.getType() == TopicExchange.TYPE) + && exchange.getExchangeType() == TopicExchange.TYPE) { MatchingSubjectFilter filter = (MatchingSubjectFilter) filters.values().iterator().next(); source.setFilter(filters); |