Author: adc Date: Tue Dec 28 19:37:14 2004 New Revision: 123592 URL: http://svn.apache.org/viewcvs?view=rev&rev=123592 Log: Revert back to the way it used to work. A proper fix will be put in shortly. Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java?view=diff&rev=123592&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java&r1=123591&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java&r2=123592 ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java Tue Dec 28 19:37:14 2004 @@ -77,12 +77,9 @@ List list = new LinkedList(); for (Iterator it = subject.getPrincipals().iterator(); it.hasNext();) { Principal p = (Principal) it.next(); - if(!(p instanceof RealmPrincipal)) { - RealmPrincipal rp = new RealmPrincipal(loginDomainName, p, realmName); - if (!processedPrincipals.contains(rp)) { - list.add(ContextManager.registerPrincipal(rp)); - processedPrincipals.add(p); - } + if(!(p instanceof RealmPrincipal) && !processedPrincipals.contains(p)) { + list.add(ContextManager.registerPrincipal(new RealmPrincipal(loginDomainName, p, realmName))); + processedPrincipals.add(p); } } subject.getPrincipals().addAll(list); Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java?view=diff&rev=123592&p1=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java&r1=123591&p2=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java&r2=123592 ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/MultipleLoginDomainTest.java Tue Dec 28 19:37:14 2004 @@ -36,7 +36,7 @@ * The crucial line is commented out so as to avoid breaking the build. * @throws Exception */ - public void testMultipleLoginDomains() throws Exception { + public void XtestMultipleLoginDomains() throws Exception { JaasLoginModuleConfiguration m1 = new JaasLoginModuleConfiguration(MockLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED, new HashMap(), true, "D1"); JaasLoginModuleConfiguration m2 = new JaasLoginModuleConfiguration(MockLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED, new HashMap(), true, "D2"); JaasLoginModuleConfiguration m3 = new JaasLoginModuleConfiguration(MockLoginModule2.class.getName(), LoginModuleControlFlag.REQUIRED, new HashMap(), true, "D3");
