From ad08039f584f14f2d783908d55748624d46d072f Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 20 Oct 2014 18:49:21 +0000 Subject: QPID-6125 : force flush after receiving frame git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633199 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 2 +- .../java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/java') 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) { -- cgit v1.2.1