diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-10-20 21:04:14 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-10-20 21:04:14 +0000 |
| commit | 7548394f2345e5cc7a1e231bf788043f47ffb898 (patch) | |
| tree | f48b17d3f77d6ba90f6fa5eac40cf809d012f170 /qpid/java/broker-plugins | |
| parent | 3c847f448c02cf66822cf906f09bbd0b40823188 (diff) | |
| download | qpid-python-7548394f2345e5cc7a1e231bf788043f47ffb898.tar.gz | |
QPID-6125 : correct the behaviour of exchange declare where the exchange already exists
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633230 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 11 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 0a3dc7a62d..77d856af7a 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -2808,6 +2808,17 @@ public class AMQChannel + " to " + type + ".", getChannelId()); } + else + { + if (!nowait) + { + sync(); + MethodRegistry methodRegistry = _connection.getMethodRegistry(); + AMQMethodBody responseBody = methodRegistry.createExchangeDeclareOkBody(); + _connection.writeFrame(responseBody.generateFrame( + getChannelId())); + } + } } catch (NoFactoryForTypeException e) { diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index 1ed249ad4d..49db24be52 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -313,9 +313,6 @@ public class AMQProtocolEngine implements ServerProtocolEngine, { _decoder.decodeBuffer(msg); receivedComplete(); - - _sender.flush(); - } catch (ConnectionScopedRuntimeException e) { |