[jboss-cvs] JBossAS SVN: r82628 - projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata.

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

Author: alesj
Date: 2009-01-06 07:49:49 -0500 (Tue, 06 Jan 2009)
New Revision: 82628

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
Log:
Simplify.

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java	2009-01-06 12:44:33 UTC (rev 82627)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java	2009-01-06 12:49:49 UTC (rev 82628)
@@ -55,13 +55,7 @@
    @Override
    protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
    {
-      boolean superIsIsolated = super.isIsolated(unit, wbXml);
-
-      if (wbXml != null)
-         return superIsIsolated;
-
-      boolean result = checkHierarchy(unit);
-      return result || superIsIsolated;
+      return (super.isIsolated(unit, wbXml) && (wbXml != null || checkHierarchy(unit)));
    }
 
    /**