From a4d092cfad2d9ee46522d737bdcdd35f3ce74f44 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 2 Jun 2010 16:43:12 +0000 Subject: QPID-2632 : Remove NullApplicationRegistry git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@950642 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/registry/ApplicationRegistry.java | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'java/broker/src/main') diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index 9adab58a0c..2164ef1b30 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -72,8 +72,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry protected final ServerConfiguration _configuration; public static final int DEFAULT_INSTANCE = 1; - public static final String DEFAULT_APPLICATION_REGISTRY = "org.apache.qpid.server.util.NullApplicationRegistry"; - public static String _APPLICATION_REGISTRY = DEFAULT_APPLICATION_REGISTRY; protected final Map _acceptors = new HashMap(); @@ -315,20 +313,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry if (instance == null) { - try - { - _logger.info("Creating DEFAULT_APPLICATION_REGISTRY: " + _APPLICATION_REGISTRY + " : Instance:" + instanceID); - IApplicationRegistry registry = (IApplicationRegistry) Class.forName(_APPLICATION_REGISTRY).getConstructor((Class[]) null).newInstance((Object[]) null); - ApplicationRegistry.initialise(registry, instanceID); - _logger.info("Initialised Application Registry:" + instanceID); - return registry; - } - catch (Exception e) - { - _logger.error("Error configuring application: " + e, e); - //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID); - throw new RuntimeException("Unable to create Application Registry", e); - } + throw new IllegalStateException("Application Registry (" + instanceID + ") not created"); } else { @@ -420,11 +405,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry } } - public static void setDefaultApplicationRegistry(String clazz) - { - _APPLICATION_REGISTRY = clazz; - } - public VirtualHostRegistry getVirtualHostRegistry() { return _virtualHostRegistry; -- cgit v1.2.1