Update SAMQQT to use an initialised Direct exchange rather than make its own.

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

1 files changed, 4 insertions, 1 deletions

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 cf46a1e97a..d9378a223b 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
@@ -26,6 +26,7 @@ import org.apache.commons.configuration.PropertiesConfiguration;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQSecurityException;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -59,7 +60,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     protected AMQShortString _qname = new AMQShortString("qname");
     protected AMQShortString _owner = new AMQShortString("owner");
     protected AMQShortString _routingKey = new AMQShortString("routing key");
-    protected DirectExchange _exchange = new DirectExchange();
+    protected DirectExchange _exchange;
     protected MockSubscription _subscription = new MockSubscription();
     protected FieldTable _arguments = null;
 
@@ -104,6 +105,8 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         applicationRegistry.getVirtualHostRegistry().registerVirtualHost(_virtualHost);
 
         _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(_qname, false, _owner, false, false, _virtualHost, _arguments);
+
+        _exchange = (DirectExchange)_virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
     }
 
     @Override