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

[Anil S. <ani...@jb...>]

  User: asaldhana
  Date: 06/07/10 17:31:53

  Modified:    src/main/org/jboss/web  AbstractWebDeployer.java
  Log:
  JBAS-2673: security domain can be null. No need for unregistration of the xacml policy.
  
  Revision  Changes    Path
  1.32      +14 -11    jboss/src/main/org/jboss/web/AbstractWebDeployer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractWebDeployer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebDeployer.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- AbstractWebDeployer.java	7 Jul 2006 16:38:41 -0000	1.31
  +++ AbstractWebDeployer.java	10 Jul 2006 21:31:53 -0000	1.32
  @@ -156,7 +156,7 @@
      extends="org.jboss.deployment.SubDeployerMBean"
   
   @author  Sco...@jb...
  -@version $Revision: 1.31 $
  +@version $Revision: 1.32 $
   */
   public abstract class AbstractWebDeployer
   {
  @@ -444,6 +444,8 @@
            pc.delete();
            //Unregister any xacml policies
            String prefixedSecurityDomain = webApp.getMetaData().getSecurityDomain();
  +         if(prefixedSecurityDomain != null)
  +         {
            String securityDomain = org.jboss.security.Util.unprefixSecurityDomain(prefixedSecurityDomain);
            AuthorizationManagerServiceMBean authorizationManager = (AuthorizationManagerServiceMBean)
                                                      MBeanProxyExt.create(AuthorizationManagerServiceMBean.class,
  @@ -456,6 +458,7 @@
               xam.deRegisterPolicy(contextID);
            }
         }
  +      }
         catch (DeploymentException e)
         {
            throw e;