Attachment 638952 Details for Bug 873465 – Quick patch to avoid declaring an existing queue

[patch] Quick patch to avoid declaring an existing queue

bz873465.patch (text/plain), 2.84 KB, created by Jason Dillaman on 2012-11-05 23:02:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Dillaman

Created: 2012-11-05 23:02:37 UTC

Size: 2.84 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
>index d2f077a..4b4954a 100644
>--- a/qpid/cpp/src/qpid/broker/Bridge.cpp
>+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
>@@ -121,28 +121,30 @@ void Bridge::create(Connection& c)
>         peer->getMessage().flow(args.i_dest, 1, 0xFFFFFFFF);
>         QPID_LOG(debug, "Activated bridge " << name << " for route from queue " << args.i_src << " to " << args.i_dest);
>     } else {
>-        FieldTable queueSettings;
>-
>-        if (args.i_tag.size()) {
>-            queueSettings.setString("qpid.trace.id", args.i_tag);
>-        } else {
>-            const string& peerTag = c.getFederationPeerTag();
>-            if (peerTag.size())
>-                queueSettings.setString("qpid.trace.id", peerTag);
>-        }
>-
>-        if (args.i_excludes.size()) {
>-            queueSettings.setString("qpid.trace.exclude", args.i_excludes);
>-        } else {
>-            const string& localTag = link->getBroker()->getFederationTag();
>-            if (localTag.size())
>-                queueSettings.setString("qpid.trace.exclude", localTag);
>+        if (!useExistingQueue) {
>+            FieldTable queueSettings;
>+
>+            if (args.i_tag.size()) {
>+                queueSettings.setString("qpid.trace.id", args.i_tag);
>+            } else {
>+                const string& peerTag = c.getFederationPeerTag();
>+                if (peerTag.size())
>+                    queueSettings.setString("qpid.trace.id", peerTag);
>+            }
>+
>+            if (args.i_excludes.size()) {
>+                queueSettings.setString("qpid.trace.exclude", args.i_excludes);
>+            } else {
>+                const string& localTag = link->getBroker()->getFederationTag();
>+                if (localTag.size())
>+                    queueSettings.setString("qpid.trace.exclude", localTag);
>+            }
>+
>+            bool durable = false;//should this be an arg, or would we use srcIsQueue for durable queues?
>+            bool exclusive = true;  // only exclusive if the queue is owned by the bridge
>+            bool autoDelete = exclusive && !durable;//auto delete transient queues?
>+            peer->getQueue().declare(queueName, altEx, false, durable, exclusive, autoDelete, queueSettings);
>         }
>-
>-        bool durable = false;//should this be an arg, or would we use srcIsQueue for durable queues?
>-        bool exclusive = !useExistingQueue;  // only exclusive if the queue is owned by the bridge
>-        bool autoDelete = exclusive && !durable;//auto delete transient queues?
>-        peer->getQueue().declare(queueName, altEx, false, durable, exclusive, autoDelete, queueSettings);
>         if (!args.i_dynamic)
>             peer->getExchange().bind(queueName, args.i_src, args.i_key, FieldTable());
>         peer->getMessage().subscribe(queueName, args.i_dest, (useExistingQueue && args.i_sync) ? 0 : 1, 0, false, "", 0, options);

Actions: View | Diff

Attachments on bug 873465: 638952