QPID-1269 : Added queue registration as part of the creation via the Factory. Updated direct creations to use the factory.. where possible.

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

3 files changed, 10 insertions, 2 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
index 19e98f416d..be8c19d18f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
@@ -70,6 +70,9 @@ public class AMQQueueFactory
         {
             q.configure(queueConfiguration);
         }
+
+        //Register the new queue
+        virtualHost.getQueueRegistry().registerQueue(q);
         return q;
     }
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 8cb57b8246..3aa6e5a36c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -41,6 +41,7 @@ public class SimpleAMQQueueTest extends TestCase
 {
 
     private SimpleAMQQueue _queue;
+    private VirtualHost _virtualHost;
     private MessageStore store = new TestableMemoryMessageStore();
     private TransactionalContext ctx = new NonTransactionalContext(store, new StoreContext(), null, null);
     private MessageHandleFactory factory = new MessageHandleFactory();
@@ -79,11 +80,14 @@ public class SimpleAMQQueueTest extends TestCase
     {
         super.setUp();
         //Create Application Registry for test
-        ApplicationRegistry.getInstance(1);
+        ApplicationRegistry applicationRegistry = (ApplicationRegistry)ApplicationRegistry.getInstance(1);
 
         AMQShortString qname = new AMQShortString("qname");
         AMQShortString owner = new AMQShortString("owner");
-        _queue = new SimpleAMQQueue(qname, false, owner, false, new VirtualHost("vhost", store));
+        _virtualHost = new VirtualHost("vhost", store);
+        _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(qname, false, owner, false, _virtualHost, null);
+        
+        applicationRegistry .getVirtualHostRegistry().registerVirtualHost(_virtualHost);
     }
 
     @Override
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index adb7a7cd0c..6dcb187a37 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -244,6 +244,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
         public TestQueue(AMQShortString name) throws AMQException
         {
             super(name, false, new AMQShortString("test"), true, ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test"));
+            ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry().registerQueue(this);
         }
 
         /**