From cc9cacef143022644cac63a8754890ec5a237ef2 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Mon, 31 Aug 2015 08:13:55 -0400 Subject: [PATCH] fixing openwire tests I removed some valid code while removing dead code. --- .../protocol/openwire/OpenWireConnection.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java index e50238bb1e..25a985d60e 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java @@ -575,12 +575,17 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S } public void dispatchAsync(Command message) { - if (message.isMessageDispatch()) { - MessageDispatch md = (MessageDispatch) message; - TransmitCallback sub = md.getTransmitCallback(); - protocolManager.postProcessDispatch(md); - if (sub != null) { - sub.onFailure(); + if (!stopping.get()) { + dispatchSync(message); + } + else { + if (message.isMessageDispatch()) { + MessageDispatch md = (MessageDispatch) message; + TransmitCallback sub = md.getTransmitCallback(); + protocolManager.postProcessDispatch(md); + if (sub != null) { + sub.onFailure(); + } } } }