Author: kwall
Date: Wed May 21 19:45:02 2014
New Revision: 1596659
URL: http://svn.apache.org/r1596659
Log:
QPID-5779: Add more logging to help understand sporadic test failure.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
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/JMXManagedObjectRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1596659&r1=1596658&r2=1596659&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
Wed May 21 19:45:02 2014
@@ -259,8 +259,7 @@ public class JMXManagedObjectRegistry im
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));
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=1596659&r1=1596658&r2=1596659&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
Wed May 21 19:45:02 2014
@@ -25,13 +25,38 @@ import java.rmi.server.RMIServerSocketFa
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;
}
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=1596659&r1=1596658&r2=1596659&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
Wed May 21 19:45:02 2014
@@ -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.RMIServerSocketFa
*/
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 RegistryProtectingRMIServerSocketF
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 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: [email protected]
For additional commands, e-mail: [email protected]
