QPID-5779: Add more logging to help understand sporadic test failure.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596659 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 51 insertions, 3 deletions

diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
index 512ff2a738..f27a9126ea 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
@@ -259,8 +259,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
     private Registry createRmiRegistry(int jmxPortRegistryServer, boolean useCustomRmiRegistry)
             throws RemoteException
     {
-        final RMIServerSocketFactory ssf;
-        ssf = getRmiServerSocketFactory(useCustomRmiRegistry);
+        final RMIServerSocketFactory ssf = getRmiServerSocketFactory(useCustomRmiRegistry);
         Registry rmiRegistry = LocateRegistry.createRegistry(jmxPortRegistryServer, null, ssf);
 
         getEventLogger().message(ManagementConsoleMessages.LISTENING("RMI Registry", jmxPortRegistryServer));
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
index 360e41b476..54ddf75044 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
@@ -25,13 +25,38 @@ import java.rmi.server.RMIServerSocketFactory;
 
 import javax.net.ServerSocketFactory;
 
+import org.apache.log4j.Logger;
+
 class QpidRMIServerSocketFactory implements RMIServerSocketFactory
 {
+    private static final Logger LOGGER = Logger.getLogger(QpidRMIServerSocketFactory.class);
+
     @Override
     public ServerSocket createServerSocket(final int port) throws IOException
     {
-        ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket();
+        ServerSocket serverSocket = new ServerSocket()
+        {
+            @Override
+            public void close() throws IOException
+            {
+                try
+                {
+                    super.close();
+                }
+                finally
+                {
+                    if (LOGGER.isDebugEnabled())
+                    {
+                        LOGGER.debug("Closed server socket : " + getInetAddress());
+                    }
+                }
+            }
+        };
         serverSocket.setReuseAddress(true);
+        if (LOGGER.isDebugEnabled())
+        {
+            LOGGER.debug("Binding server socket : " + port);
+        }
         serverSocket.bind(new InetSocketAddress(port));
         return serverSocket;
     }
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
index b03dee2629..45c65faf59 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
@@ -19,6 +19,8 @@
  */
 package org.apache.qpid.server.jmx;
 
+import org.apache.log4j.Logger;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -36,6 +38,8 @@ import java.rmi.server.RMIServerSocketFactory;
  */
 class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory
 {
+    private static final Logger LOGGER = Logger.getLogger(RegistryProtectingRMIServerSocketFactory.class);
+
 
     @Override
     public ServerSocket createServerSocket(int port) throws IOException
@@ -43,6 +47,10 @@ class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory
         NoLocalAddressServerSocket serverSocket = new NoLocalAddressServerSocket();
         serverSocket.setReuseAddress(true);
         serverSocket.bind(new InetSocketAddress(port));
+        if (LOGGER.isDebugEnabled())
+        {
+            LOGGER.debug("Binding server socket : " + port);
+        }
         return serverSocket;
     }
 
@@ -67,6 +75,22 @@ class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory
         }
 
         @Override
+        public void close() throws IOException
+        {
+            try
+            {
+                super.close();
+            }
+            finally
+            {
+                if (LOGGER.isDebugEnabled())
+                {
+                    LOGGER.debug("Closed server socket : " + getInetAddress());
+                }
+            }
+        }
+
+        @Override
         public Socket accept() throws IOException
         {
             Socket s = new NoLocalAddressSocket();