From dc41354bc7b95d806363cce746c585ff42f999d7 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Wed, 24 Jun 2009 20:56:15 +0000
Subject: added system properties to control declaration of exchanges and
 queues QPID-155 requests this change

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@788179 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/client/AMQSession.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'java/client/src')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index a40295a9b7..118be75705 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -205,6 +205,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
      */
     protected static final boolean DEFAULT_MANDATORY = Boolean.parseBoolean(System.getProperty("qpid.default_mandatory", "true"));
 
+    protected static final boolean DECLARE_QUEUES =
+        Boolean.parseBoolean(System.getProperty("qpid.declare_queues", "true"));
+    protected static final boolean DECLARE_EXCHANGES =
+        Boolean.parseBoolean(System.getProperty("qpid.declare_exchanges", "true"));
+
     /** System property to enable strict AMQP compliance. */
     public static final String STRICT_AMQP = "STRICT_AMQP";
 
@@ -2465,9 +2470,16 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
 
         AMQProtocolHandler protocolHandler = getProtocolHandler();
 
-        declareExchange(amqd, protocolHandler, nowait);
+        if (DECLARE_EXCHANGES)
+        {
+            declareExchange(amqd, protocolHandler, nowait);
+        }
 
-        AMQShortString queueName = declareQueue(amqd, protocolHandler, consumer.isNoLocal(), nowait);
+        if (DECLARE_QUEUES || amqd.isNameRequired())
+        {
+            declareQueue(amqd, protocolHandler, consumer.isNoLocal(), nowait);
+        }
+        AMQShortString queueName = amqd.getAMQQueueName();
 
         // store the consumer queue name
         consumer.setQueuename(queueName);
-- 
cgit v1.2.1