[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbEnterpriseContext.java

[jBoss CVS Development]

  User: oleg    
  Date: 00/11/18 17:58:05

  Modified:    src/main/org/jboss/ejb EnterpriseContext.java
  Log:
  BugFix: beanPrincipal was cached incorrectly (reported by Keith L. Musser 
<[EMAIL PROTECTED]>)
  FlawFix: Now authentication (security manager) can be used without role mapping
  (sorry Dan, one of my previous changes made it impossible).
  
  Revision  Changes    Path
  1.22      +8 -3      jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- EnterpriseContext.java    2000/11/17 09:36:10     1.21
  +++ EnterpriseContext.java    2000/11/19 01:58:05     1.22
  @@ -37,7 +37,7 @@
    *  @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *  @version $Revision: 1.21 $
  + *  @version $Revision: 1.22 $
    */
   public abstract class EnterpriseContext
   {
  @@ -107,6 +107,7 @@
       public void setPrincipal(Principal principal) {
          
          this.principal = principal;
  +       this.beanPrincipal = null;
   
       }
       
  @@ -175,8 +176,12 @@
         
         public Principal getCallerPrincipal() 
          { 
  -         if (principal != null && beanPrincipal == null && con.getRealmMapping() != 
null) {
  -             beanPrincipal = con.getRealmMapping().getPrincipal( principal );
  +         if (beanPrincipal == null && principal != null) {
  +             if (con.getRealmMapping() == null) {
  +                 beanPrincipal = principal;
  +             } else {
  +                 beanPrincipal = con.getRealmMapping().getPrincipal(principal);
  +             }
            }
            return beanPrincipal;
          }