You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/05/22 12:06:50 UTC

svn commit: r1596797 - in /qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx: QpidRMIServerSocketFactory.java RegistryProtectingRMIServerSocketFactory.java

Author: kwall
Date: Thu May 22 10:06:50 2014
New Revision: 1596797

URL: http://svn.apache.org/r1596797
Log:
QPID-5779: [Java Broker] JMX plugin Remove debug logging from socket factories

Modified:
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
    qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java

Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java?rev=1596797&r1=1596796&r2=1596797&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java Thu May 22 10:06:50 2014
@@ -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;
     }

Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java?rev=1596797&r1=1596796&r2=1596797&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java Thu May 22 10:06:50 2014
@@ -38,19 +38,12 @@ import java.rmi.server.RMIServerSocketFa
  */
 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;
     }
 
@@ -75,22 +68,6 @@ class RegistryProtectingRMIServerSocketF
         }
 
         @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();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org