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

[jBoss CVS Development]

  User: stark   
  Date: 01/03/05 02:18:07

  Modified:    src/main/org/jboss/ejb EnterpriseContext.java
  Log:
  Don't allow getCallerPrincipal call if there is no security context
  
  Revision  Changes    Path
  1.26      +6 -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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- EnterpriseContext.java    2001/02/12 01:17:27     1.25
  +++ EnterpriseContext.java    2001/03/05 10:18:07     1.26
  @@ -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.25 $
  + *  @version $Revision: 1.26 $
    */
   public abstract class EnterpriseContext
   {
  @@ -187,13 +187,16 @@
         
         public Principal getCallerPrincipal() 
          { 
  -         if (beanPrincipal == null && principal != null) {
  -             if (con.getRealmMapping() == null) {
  +         if (beanPrincipal == null && principal != null)
  +         {
  +             if( con.getRealmMapping() == null ) {
                    beanPrincipal = principal;
                } else {
                    beanPrincipal = con.getRealmMapping().getPrincipal(principal);
                }
            }
  +         else if( beanPrincipal == null && con.getRealmMapping() == null )
  +             throw new IllegalStateException("No security context set");
            return beanPrincipal;
          }