1 files changed, 11 insertions, 12 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
index ecd5e58986..c599ab4608 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
@@ -65,19 +65,18 @@ public class ConnectionRegistry implements IConnectionRegistry
         while (!_registry.isEmpty())
         {
             AMQConnectionModel connection = _registry.get(0);
-            closeConnection(connection, AMQConstant.CONNECTION_FORCED, replyText);
-        }
-    }
 
-    private void closeConnection(AMQConnectionModel connection, AMQConstant cause, String message)
-    {
-        try
-        {
-            connection.close(cause, message);
-        }
-        catch (Exception e)
-        {
-            _logger.warn("Exception closing connection", e);
+            try
+            {
+                connection.close(AMQConstant.CONNECTION_FORCED, replyText);
+            }
+            catch (Exception e)
+            {
+                //remove this connection to ensure that we don't loop forever if it fails to close
+                _registry.remove(connection);
+
+                _logger.warn("Exception closing connection " + connection.getConnectionId() + " from " + connection.getRemoteAddressString(), e);
+            }
         }
     }