[jboss-cvs] JBossAS SVN: r61804 - trunk/server/src/main/org/jboss/deployment/security.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2007-03-28 14:15:28 -0400 (Wed, 28 Mar 2007)
New Revision: 61804

Modified:
   trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
Log:
use unit.getParent() to determine top-level status

Modified: trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java	2007-03-28 18:14:51 UTC (rev 61803)
+++ trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java	2007-03-28 18:15:28 UTC (rev 61804)
@@ -22,7 +22,7 @@
 package org.jboss.deployment.security;
 
 import java.util.ArrayList;
-import java.util.Collection; 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -54,11 +54,6 @@
       return JaccPolicy.BASE_OBJECT_NAME + du.getSimpleName();
    }
    
-   public static boolean isTopLevelDeployment(DeploymentUnit unit)
-   {
-      return unit.getDeploymentContext().isTopLevel();
-   }
-   
    /**
     * Given a deployment unit, get all the deployments underneath
     * that are valid Jacc deployments (ejbs,wars)
@@ -127,10 +122,14 @@
     */
    private static DeploymentUnit getTopLevelDeployment(DeploymentUnit unit)
    {
-      //TODO: Use the unit.getParent when available 
-      DeploymentContext parentContext = unit.getDeploymentContext();
-      while(parentContext.isTopLevel() == false) 
-         parentContext = parentContext.getParent(); 
-      return parentContext.getDeploymentUnit();
+      DeploymentUnit tempDU = unit;
+      DeploymentUnit toplevel = tempDU.getParent();
+
+      if(toplevel != null)
+      {
+         tempDU = toplevel;
+         toplevel = tempDU.getParent();
+      }
+      return tempDU; 
    } 
 }