[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/security/config/css CSSGSSUPMechConfigDynamic.java

[djencks]

djencks     2005/10/07 15:53:05

  Modified:    modules/core/src/java/org/openejb/corba/security/config/css
                        CSSGSSUPMechConfigDynamic.java
  Log:

  GERONIMO-1051 Fix CSSGSSUPMechConfigDynamic
  
  Revision  Changes    Path
  1.2       +5 -8      
openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSGSSUPMechConfigDynamic.java
  
  Index: CSSGSSUPMechConfigDynamic.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/config/css/CSSGSSUPMechConfigDynamic.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CSSGSSUPMechConfigDynamic.java    31 Mar 2005 15:28:11 -0000      1.1
  +++ CSSGSSUPMechConfigDynamic.java    7 Oct 2005 19:53:05 -0000       1.2
  @@ -51,6 +51,7 @@
   import javax.security.auth.Subject;
   
   import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
  +import org.apache.geronimo.security.ContextManager;
   
   import org.openejb.corba.security.config.tss.TSSASMechConfig;
   import org.openejb.corba.security.config.tss.TSSGSSUPMechConfig;
  @@ -91,13 +92,9 @@
       public byte[] encode() {
           if (encoding == null) {
               NamedUsernamePasswordCredential credential = null;
  +            Subject subject = ContextManager.getCurrentCaller();
   
  -            Set creds = (Set) AccessController.doPrivileged(new 
PrivilegedAction() {
  -                public Object run() {
  -                    Subject subject = 
Subject.getSubject(AccessController.getContext());
  -                    return 
subject.getPrivateCredentials(NamedUsernamePasswordCredential.class);
  -                }
  -            });
  +            Set creds = 
subject.getPrivateCredentials(NamedUsernamePasswordCredential.class);
   
               if (creds.size() != 0) {
                   for (Iterator iter = creds.iterator(); iter.hasNext();) {