You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2004/01/10 23:56:08 UTC

cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/security LoginModuleWrapper.java

adc         2004/01/10 14:56:08

  Modified:    modules/core/src/java/org/apache/geronimo/security
                        LoginModuleWrapper.java
  Log:
  Context cleanup
  
  Revision  Changes    Path
  1.7       +3 -10     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/LoginModuleWrapper.java
  
  Index: LoginModuleWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/LoginModuleWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoginModuleWrapper.java	5 Jan 2004 18:56:34 -0000	1.6
  +++ LoginModuleWrapper.java	10 Jan 2004 22:56:08 -0000	1.7
  @@ -55,8 +55,6 @@
    */
   package org.apache.geronimo.security;
   
  -import java.security.AccessControlContext;
  -import java.security.AccessController;
   import java.security.Principal;
   import java.security.PrivilegedActionException;
   import java.util.Iterator;
  @@ -139,12 +137,7 @@
           externalSubject.getPrivateCredentials().addAll(internalSubject.getPrivateCredentials());
           externalSubject.getPublicCredentials().addAll(internalSubject.getPublicCredentials());
   
  -        AccessControlContext context = (AccessControlContext) Subject.doAsPrivileged(externalSubject, new java.security.PrivilegedAction() {
  -            public Object run() {
  -                return AccessController.getContext();
  -            }
  -        }, null);
  -        ContextManager.registerContext(externalSubject, context);
  +        ContextManager.registerSubject(externalSubject);
   
           return true;
       }
  @@ -154,7 +147,7 @@
       }
   
       public boolean logout() throws LoginException {
  -        ContextManager.unregisterContext(externalSubject);
  +        ContextManager.unregisterSubject(externalSubject);
   
           return module.logout();
       }