Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 24690 invoked from network); 6 Mar 2009 14:23:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Mar 2009 14:23:14 -0000 Received: (qmail 57967 invoked by uid 500); 6 Mar 2009 14:23:14 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 57952 invoked by uid 500); 6 Mar 2009 14:23:14 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 57943 invoked by uid 99); 6 Mar 2009 14:23:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 06:23:13 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2009 14:23:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED5D12388999; Fri, 6 Mar 2009 14:22:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750913 - in /qpid/trunk/qpid/cpp/src/qpid: SessionId.cpp acl/AclPlugin.cpp Date: Fri, 06 Mar 2009 14:22:50 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090306142250.ED5D12388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 sessionid@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-subscribe@qpid.apache.org