1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
index c153f31872..4df5fb50fc 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
@@ -91,6 +91,10 @@ public class AmqpPortImplTest extends QpidTestCase
         {
             if (_port != null)
             {
+                while(_port.getConnectionCount() >0)
+                {
+                    _port.decrementConnectionCount();
+                }
                 _port.close();
             }
             super.tearDown();