activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: fixing openwire tests
Date Mon, 31 Aug 2015 12:14:37 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master ea3fef4e5 -> cc9cacef1


fixing openwire tests

I removed some valid code while removing dead code.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cc9cacef
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cc9cacef
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cc9cacef

Branch: refs/heads/master
Commit: cc9cacef143022644cac63a8754890ec5a237ef2
Parents: ea3fef4
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Aug 31 08:13:55 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Aug 31 08:14:25 2015 -0400

----------------------------------------------------------------------
 .../core/protocol/openwire/OpenWireConnection.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cc9cacef/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
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 e50238b..25a985d 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();
+            }
          }
       }
    }


Mime
View raw message