diff options
Diffstat (limited to 'qpid/java')
2 files changed, 5 insertions, 12 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index 61bbfce4a3..4aa1ba47cd 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -115,21 +115,11 @@ public abstract class ApplicationRegistry implements IApplicationRegistry private BundleContext _bundleContext; - protected static Logger get_logger() - { - return _logger; - } - protected Map<InetSocketAddress, QpidAcceptor> getAcceptors() { return _acceptors; } - private QpidAcceptor getAcceptor(SocketAddress address) - { - return _acceptors.get(address); - } - protected void setManagedObjectRegistry(ManagedObjectRegistry managedObjectRegistry) { _managedObjectRegistry = managedObjectRegistry; @@ -409,12 +399,15 @@ public abstract class ApplicationRegistry implements IApplicationRegistry } else { + for (AuthenticationManager authenticationManger : authManagersByClass.values()) + { + authenticationManger.close(); + } throw new ConfigurationException("If more than one authentication manager is configured a default MUST be specified."); } Map<Integer,AuthenticationManager> authManagers = new HashMap<Integer, AuthenticationManager>(); authManagers .put(null, defaultAuthMgr); - String host = _configuration.getBind(); for(Map.Entry<Integer,String> portMapping : _configuration.getPortAuthenticationMappings().entrySet()) { diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java index dd2a82e9e1..21c9a85bf7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java @@ -89,7 +89,7 @@ public class KerberosAuthenticationManager implements AuthenticationManager // If there is no configuration for this plugin then don't load it. if (configuration == null) { - _logger.info("No authentication-manager configuration found for AnonymousAuthenticationManager"); + _logger.info("No authentication-manager configuration found for KerberosAuthenticationManager"); return null; } KerberosAuthenticationManager kerberosAuthenticationManager = new KerberosAuthenticationManager(); |