From 18954116815b65c948fa7cf4720b4c170efa0c14 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Thu, 22 May 2014 10:06:50 +0000
Subject: QPID-5779: [Java Broker] JMX plugin Remove debug logging from socket
 factories

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596797 13f79535-47bb-0310-9956-ffa450edef68
---
 .../server/jmx/QpidRMIServerSocketFactory.java     | 29 +---------------------
 .../RegistryProtectingRMIServerSocketFactory.java  | 23 -----------------
 2 files changed, 1 insertion(+), 51 deletions(-)

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 2ad4f6af74..29d6fb8df8 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
@@ -23,40 +23,13 @@ import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 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 = new ServerSocket()
-        {
-            @Override
-            public void close() throws IOException
-            {
-                try
-                {
-                    super.close();
-                }
-                finally
-                {
-                    if (LOGGER.isDebugEnabled())
-                    {
-                        LOGGER.debug("Closed server socket : " + getInetAddress());
-                    }
-                }
-            }
-        };
+        ServerSocket serverSocket = new ServerSocket();
         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 432d84fc42..653ecdc7c9 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
@@ -38,19 +38,12 @@ 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
     {
         NoLocalAddressServerSocket serverSocket = new NoLocalAddressServerSocket();
         serverSocket.setReuseAddress(true);
         serverSocket.bind(new InetSocketAddress(port));
-        if (LOGGER.isDebugEnabled())
-        {
-            LOGGER.debug("Binding server socket : " + port);
-        }
         return serverSocket;
     }
 
@@ -74,22 +67,6 @@ class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory
             super();
         }
 
-        @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
         {
-- 
cgit v1.2.1