Author: aconway
Date: Fri Mar 6 14:22:50 2009
New Revision: 750913
URL: http://svn.apache.org/viewvc?rev=750913&view=rev
Log:
AclPlugin: Use --acl-file unmodified if --no-data-dir.
SessionId: print as userid.sessionid rather than sessio...@userid.
Modified:
qpid/trunk/qpid/cpp/src/qpid/SessionId.cpp
qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/SessionId.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/SessionId.cpp?rev=750913&r1=750912&r2=750913&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/SessionId.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/SessionId.cpp Fri Mar 6 14:22:50 2009
@@ -35,7 +35,7 @@
}
std::ostream& operator<<(std::ostream& o, const SessionId& id) {
- return o << id.getName() << "@" << id.getUserId();
+ return o << id.getUserId() << "." << id.getName();
}
std::string SessionId::str() const {
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp?rev=750913&r1=750912&r2=750913&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp Fri Mar 6 14:22:50 2009
@@ -62,15 +62,10 @@
if (acl) throw Exception("ACL plugin cannot be initialized twice in one
process.");
- if (values.aclFile.at(0) == '/')
- {
- values.aclFile = values.aclFile;
- }
- else
- {
- std::ostringstream oss;
- oss << b.getDataDir().getPath() << "/" << values.aclFile;
- values.aclFile = oss.str();
+ if (values.aclFile.at(0) != '/' && !b.getDataDir().getPath().empty()) {
+ std::ostringstream oss;
+ oss << b.getDataDir().getPath() << "/" << values.aclFile;
+ values.aclFile = oss.str();
}
acl = new Acl(values, b);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
