1 files changed, 5 insertions, 9 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index 895fd66fa1..a871c754b5 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
@@ -340,15 +340,11 @@ public class TransportConnection
         VmPipeAddress pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
         if (pipe != null)
         {
-            VmPipeAddress pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
-            if (pipe != null)
-            {
-                _logger.info("Killing VM Broker:" + port);
-                _inVmPipeAddress.remove(port);
-                // This does need to be sychronized as otherwise mina can hang
-                // if a new connection is made
-                _acceptor.unbind(pipe);
-            }
+            _logger.info("Killing VM Broker:" + port);
+            _inVmPipeAddress.remove(port);
+            // This does need to be sychronized as otherwise mina can hang
+            // if a new connection is made
+            _acceptor.unbind(pipe);
         }
     }