QPID-2632 : Remove NullApplicationRegistry

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@950642 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 21 deletions

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<InetSocketAddress, QpidAcceptor> _acceptors = new HashMap<InetSocketAddress, QpidAcceptor>();
 
@@ -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;