[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/security ServerSecurityInterceptor.java

[djencks]

djencks     2005/03/14 18:02:02

  Modified:    modules/core/src/java/org/openejb/corba/security
                        ServerSecurityInterceptor.java
  Log:

  Don't unregister the defaultSubject on return from a call
  
  Revision  Changes    Path
  1.6       +4 -4      
openejb/modules/core/src/java/org/openejb/corba/security/ServerSecurityInterceptor.java
  
  Index: ServerSecurityInterceptor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/ServerSecurityInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServerSecurityInterceptor.java    14 Mar 2005 02:12:46 -0000      1.5
  +++ ServerSecurityInterceptor.java    14 Mar 2005 23:02:02 -0000      1.6
  @@ -164,7 +164,7 @@
   //            Subject identity = (Subject) subjectAny.extract_Value();
               Subject identity = SubjectManager.clearSubject(ri.request_id());
   
  -            if (identity != null) ContextManager.unregisterSubject(identity);
  +            if (identity != null && identity != defaultSubject) 
ContextManager.unregisterSubject(identity);
           } catch (InvalidSlot is) {
               log.error("InvalidSlot thrown", is);
               throw new INTERNAL("InvalidSlot thrown: " + is);
  @@ -180,7 +180,7 @@
   //            Subject identity = (Subject) subjectAny.extract_Value();
               Subject identity = SubjectManager.clearSubject(ri.request_id());
   
  -            if (identity != null) ContextManager.unregisterSubject(identity);
  +            if (identity != null && identity != defaultSubject) 
ContextManager.unregisterSubject(identity);
           } catch (InvalidSlot is) {
               log.error("InvalidSlot thrown", is);
               throw new INTERNAL("InvalidSlot thrown: " + is);