qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1478632 - /qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Date Fri, 03 May 2013 03:25:42 GMT
Author: aconway
Date: Fri May  3 03:25:42 2013
New Revision: 1478632

URL: http://svn.apache.org/r1478632
Log:
QPID-4775: Fix core dumps in HA tests introduced in r1478418

After this revision several of the tests in ha_tests.py were core dumping with 0
pointers in FieldTable entries in Queue::settings. It's not clear why the core
dumps were occuring nor why this patch fixes them. This patch eliminates a call
to the QueueSettings copy constructor, so something fishy going is on there.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1478632&r1=1478631&r2=1478632&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri May  3 03:25:42 2013
@@ -1197,13 +1197,12 @@ void Broker::deleteQueue(const std::stri
     if (queue) {
         if (acl) {
             std::map<acl::Property, std::string> params;
-            const qpid::broker::QueueSettings settings = queue->getSettings();
             boost::shared_ptr<Exchange> altEx = queue->getAlternateExchange();
             params.insert(make_pair(acl::PROP_ALTERNATE, (altEx) ? altEx->getName() :
"" ));
             params.insert(make_pair(acl::PROP_DURABLE, queue->isDurable() ? _TRUE : _FALSE));
             params.insert(make_pair(acl::PROP_EXCLUSIVE, queue->hasExclusiveOwner() ?
_TRUE : _FALSE));
             params.insert(make_pair(acl::PROP_AUTODELETE, queue->isAutoDelete() ? _TRUE
: _FALSE));
-            params.insert(make_pair(acl::PROP_POLICYTYPE, settings.dropMessagesAtLimit ?
"ring" : "reject"));
+            params.insert(make_pair(acl::PROP_POLICYTYPE, queue->getSettings().dropMessagesAtLimit
? "ring" : "reject"));
 
             if (!acl->authorise(userId,acl::ACT_DELETE,acl::OBJ_QUEUE,name,&params)
)
                 throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied queue delete
request from " << userId));



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message