[jboss-cvs] jboss/src/main/org/jboss/ejb ...

[Anil Saldhana]

  User: asaldhana
  Date: 06/07/11 12:20:39

  Modified:    src/main/org/jboss/ejb  EjbModule.java
  Log:
  JBAS-2673: Do not try unregistration of xacml policy if there is no security domain
  
  Revision  Changes    Path
  1.73      +8 -5      jboss/src/main/org/jboss/ejb/EjbModule.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EjbModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EjbModule.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -b -r1.72 -r1.73
  --- EjbModule.java	7 Jul 2006 16:35:19 -0000	1.72
  +++ EjbModule.java	11 Jul 2006 16:20:39 -0000	1.73
  @@ -98,7 +98,7 @@
    * @author <a href="mailto:Adrian.Brock at HappeningTimes.com">Adrian.Brock</a>
    * @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
    * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
  - * @version $Revision: 1.72 $
  + * @version $Revision: 1.73 $
    *
    * @jmx:mbean extends="org.jboss.system.ServiceMBean"
    */
  @@ -488,12 +488,15 @@
         pc.delete();
         //Unregister any xacml policies
         String securityDomain = Util.unprefixSecurityDomain(metaData.getSecurityDomain());
  +      if(securityDomain != null)
  +      {
         AuthorizationManager authzmgr = authorizationManagerService.getAuthorizationManager(securityDomain);
         if(authzmgr instanceof PolicyRegistration)
         {
            PolicyRegistration xam = (PolicyRegistration)authzmgr;
            xam.deRegisterPolicy(contextID);
         } 
  +      } 
         
         while ( iter.hasPrevious() )
         {