activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: fix AMQ1936Test, AMQ2021Test timeouts - hitting unnecessary 1s wait on shutdown command completion
Date Fri, 13 Feb 2015 12:01:26 GMT
Repository: activemq
Updated Branches:
  refs/heads/master b60bfbbeb -> db084ef77


fix AMQ1936Test,AMQ2021Test timeouts - hitting unnecessary 1s wait on shutdown command completion


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

Branch: refs/heads/master
Commit: db084ef776b8870456b76392706ec66e89294bfc
Parents: b60bfbb
Author: gtully <gary.tully@gmail.com>
Authored: Fri Feb 13 12:01:50 2015 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Feb 13 12:01:50 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/transport/vm/VMTransport.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/db084ef7/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
index 75bd6fe..ec1a423 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java
@@ -183,11 +183,10 @@ public class VMTransport implements Transport, Task {
                 mq.clear();
             }
 
-            // Allow pending deliveries to finish up, but don't wait
-            // forever in case of an stalled onCommand.
+            // don't wait for completion
             if (tr != null) {
                 try {
-                    tr.shutdown(TimeUnit.SECONDS.toMillis(1));
+                    tr.shutdown(1);
                 } catch(Exception e) {
                 }
                 tr = null;


Mime
View raw message