Attachment 712007 Details for Bug 919017 – Slightly modified patch to compile on current trunk

[patch] Slightly modified patch to compile on current trunk

xmlExchange.patch (text/plain), 1.14 KB, created by Ernie on 2013-03-18 14:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2013-03-18 14:41:03 UTC

Size: 1.14 KB

patch

obsolete

>Index: cpp/src/qpid/xml/XmlExchange.cpp
>===================================================================
>--- cpp/src/qpid/xml/XmlExchange.cpp	(revision 1454425)
>+++ cpp/src/qpid/xml/XmlExchange.cpp	(working copy)
>@@ -319,14 +319,16 @@
>         {
>             RWlock::ScopedRlock l(lock);
>             p = bindingsMap[routingKey].snapshot();
>-            if (!p.get()) return;
>         }
> 
>-        for (std::vector<XmlBinding::shared_ptr>::const_iterator i = p->begin(); i != p->end(); i++) {
>-            if (matches((*i)->xquery, msg, (*i)->parse_message_content)) { 
>-                b->push_back(*i);
>-            }
>+        if (p.get()) {
>+            for (std::vector<XmlBinding::shared_ptr>::const_iterator i = p->begin(); i != p->end(); i++) {
>+                   if (matches((*i)->xquery, msg, (*i)->parse_message_content)) {
>+                       b->push_back(*i);
>+                }
>+             }
>         }
>+        // else allow stats to be counted, even for non-matched messages
>         doRoute(msg, b);
>     } catch (...) {
>         QPID_LOG(warning, "XMLExchange " << getName() << ": exception routing message with query " << routingKey);

Actions: View | Diff

Attachments on bug 919017: 706551 | 708424 | 712007 | 781348