diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2008-12-10 14:53:07 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2008-12-10 14:53:07 +0000 |
| commit | 7bac78cee32d55dd1e2ea06feb59563f32f9fa14 (patch) | |
| tree | 030f6c02212f1bdc8cdfe640d1e1512cd3e2af24 /cpp/src/qpid | |
| parent | ce2f5bbba4efcce8ce4e9a4e8c441086e114237b (diff) | |
| download | qpid-python-7bac78cee32d55dd1e2ea06feb59563f32f9fa14.tar.gz | |
This is related to QPID-1523
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@725303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/acl/AclPlugin.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cpp/src/qpid/acl/AclPlugin.cpp b/cpp/src/qpid/acl/AclPlugin.cpp index ffba8d44cf..7310139041 100644 --- a/cpp/src/qpid/acl/AclPlugin.cpp +++ b/cpp/src/qpid/acl/AclPlugin.cpp @@ -61,9 +61,17 @@ struct AclPlugin : public Plugin { } if (acl) throw Exception("ACL plugin cannot be initialized twice in one process."); - std::ostringstream oss; - oss << b.getDataDir().getPath() << "/" << values.aclFile; - values.aclFile = oss.str(); + + if (values.aclFile.at(0) == '/') + { + values.aclFile = values.aclFile; + } + else + { + std::ostringstream oss; + oss << b.getDataDir().getPath() << "/" << values.aclFile; + values.aclFile = oss.str(); + } acl = new Acl(values, b); b.setAcl(acl.get()); @@ -89,5 +97,5 @@ static AclPlugin instance; // Static initialization. // For test purposes. boost::intrusive_ptr<Acl> getGlobalAcl() { return instance.acl; } - + }} // namespace qpid::acl |