From 14047243f883ddd4fdb566b7be9e5d2dbafeaf72 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Tue, 4 Sep 2012 13:18:32 +0000 Subject: QPID-4271: improve behaviour when embedding the broker inside a container Avoid potential ThreadLocal leaks on Container owned threads for CurrentActor, AMQShortString and SecurityManager. Have LogRecorder unregistered itself from Log4J. Allow SIGHUP handling to be turned off (inappropiate to install signal handling when deployed inside Container. Allow use of custom RMI socket factory to be disabled. (The registration of a custom RMI socket with the JRE cannot be reversed (deficiency in JRE API) and this causes a large perm-gen leak). Work of Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380625 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker-plugins/management-jmx') 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 44fe4787bb..cb2e9f5e54 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 @@ -211,10 +211,12 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry System.setProperty("java.rmi.server.randomIDs", "true"); if(_useCustomSocketFactory) { + _log.debug("Using custom RMIServerSocketFactory"); _rmiRegistry = LocateRegistry.createRegistry(_jmxPortRegistryServer, null, new CustomRMIServerSocketFactory()); } else { + _log.debug("Using default RMIServerSocketFactory"); _rmiRegistry = LocateRegistry.createRegistry(_jmxPortRegistryServer, null, null); } @@ -235,7 +237,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry /** * Override makeClient so we can cache the username of the client in a Map keyed by connectionId. - * ConnectionId is guaranteed to be unique per client connection, according to the JMS spec. + * ConnectionId is guaranteed to be unique per client connection, according to the JMX spec. * An instance of NotificationListener (mapCleanupListener) will be responsible for removing these Map * entries. * -- cgit v1.2.1