Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 33765 invoked from network); 16 Sep 2008 14:45:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Sep 2008 14:45:21 -0000 Received: (qmail 73830 invoked by uid 500); 16 Sep 2008 14:45:17 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 73819 invoked by uid 500); 16 Sep 2008 14:45:17 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 73808 invoked by uid 99); 16 Sep 2008 14:45:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2008 07:45:17 -0700 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; Tue, 16 Sep 2008 14:44:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C054C23889BB; Tue, 16 Sep 2008 07:44:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r695925 - /portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java Date: Tue, 16 Sep 2008 14:44:59 -0000 To: jetspeed-dev@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080916144459.C054C23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ate Date: Tue Sep 16 07:44:59 2008 New Revision: 695925 URL: http://svn.apache.org/viewvc?rev=695925&view=rev Log: Fix associationHandler key creation Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java?rev=695925&r1=695924&r2=695925&view=diff ============================================================================== --- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java (original) +++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java Tue Sep 16 07:44:59 2008 @@ -172,7 +172,7 @@ public final List getAssociatedFrom(String principalFromName, JetspeedPrincipalType from, String associationName) { - if ( !assHandlers.containsKey(new AssociationHandlerKey(from.getName(), principalType.getName(), associationName))) + if ( !assHandlers.containsKey(new AssociationHandlerKey(associationName, from.getName(), principalType.getName()))) { // TODO: should we throw an exception here??? return Collections.EMPTY_LIST; @@ -182,7 +182,7 @@ public final List getAssociatedNamesFrom(String principalFromName, JetspeedPrincipalType from, String associationName) { - if ( !assHandlers.containsKey(new AssociationHandlerKey(from.getName(), principalType.getName(), associationName))) + if ( !assHandlers.containsKey(new AssociationHandlerKey(associationName, from.getName(), principalType.getName()))) { // TODO: should we throw an exception here??? return Collections.EMPTY_LIST; @@ -192,7 +192,7 @@ public final List getAssociatedNamesTo(String principalToName, JetspeedPrincipalType to, String associationName) { - if ( !assHandlers.containsKey(new AssociationHandlerKey(principalType.getName(), to.getName(), associationName))) + if ( !assHandlers.containsKey(new AssociationHandlerKey(associationName, principalType.getName(), to.getName()))) { // TODO: should we throw an exception here??? return Collections.EMPTY_LIST; @@ -202,7 +202,7 @@ public final List getAssociatedTo(String principalToName, JetspeedPrincipalType to, String associationName) { - if ( !assHandlers.containsKey(new AssociationHandlerKey(principalType.getName(), to.getName(), associationName))) + if ( !assHandlers.containsKey(new AssociationHandlerKey(associationName, principalType.getName(), to.getName()))) { // TODO: should we throw an exception here??? return Collections.EMPTY_LIST; --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org