From db084ef776b8870456b76392706ec66e89294bfc Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Fri, 13 Feb 2015 12:01:50 +0000
Subject: [PATCH] fix AMQ1936Test,AMQ2021Test timeouts - hitting unnecessary 1s
 wait on shutdown command completion

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

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 75bd6feb06..ec1a423cac 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;