diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-10-20 18:49:21 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-10-20 18:49:21 +0000 |
| commit | ad08039f584f14f2d783908d55748624d46d072f (patch) | |
| tree | 7ef0dc8ac821af38694fce5ca3b7e3f7eaafd972 /qpid/java | |
| parent | 5d918382ea79f28aaac0c897e836094f9cb0f532 (diff) | |
| download | qpid-python-ad08039f584f14f2d783908d55748624d46d072f.tar.gz | |
QPID-6125 : force flush after receiving frame
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633199 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 4 insertions, 1 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 2cf94053ac..0a3dc7a62d 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 @@ -2781,11 +2781,11 @@ public class AMQChannel if (!nowait) { + sync(); MethodRegistry methodRegistry = _connection.getMethodRegistry(); AMQMethodBody responseBody = methodRegistry.createExchangeDeclareOkBody(); _connection.writeFrame(responseBody.generateFrame( getChannelId())); - sync(); } } 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 49db24be52..1ed249ad4d 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,6 +313,9 @@ public class AMQProtocolEngine implements ServerProtocolEngine, { _decoder.decodeBuffer(msg); receivedComplete(); + + _sender.flush(); + } catch (ConnectionScopedRuntimeException e) { |