summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2014-07-02 21:55:28 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2014-07-02 21:55:28 +0000
commitd75ced8626fbe4064b56c7ccdb56236c2c968584 (patch)
tree8cd212b1e31d18a99af8f07a080d652c7e57121e /qpid/cpp
parent3dbb260c2cba4cd7f57b17e73e663f3708b621b0 (diff)
downloadqpid-python-d75ced8626fbe4064b56c7ccdb56236c2c968584.tar.gz
QPID-5869 Added a check to see if agent is null before firing the event.
There are other places in the code where this check is missing. Chuck will take care of them. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607488 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/acl/Acl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
index 8a71cf7782..d6a6bd6140 100644
--- a/qpid/cpp/src/qpid/acl/Acl.cpp
+++ b/qpid/cpp/src/qpid/acl/Acl.cpp
@@ -248,7 +248,9 @@ bool Acl::readAclFile(std::string& aclFile, std::string& errorText) {
boost::shared_ptr<AclData> d(new AclData);
AclReader ar(aclValues.aclMaxConnectPerUser, aclValues.aclMaxQueuesPerUser);
if (ar.read(aclFile, d)){
- agent->raiseEvent(_qmf::EventFileLoadFailed("", ar.getError()));
+ if (agent != 0){
+ agent->raiseEvent(_qmf::EventFileLoadFailed("", ar.getError()));
+ }
errorText = ar.getError();
QPID_LOG(error,ar.getError());
return false;