[jboss-cvs] JBossAS SVN: r90746 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: alex.loubyansky at jboss.com
Date: 2009-07-01 10:09:08 -0400 (Wed, 01 Jul 2009)
New Revision: 90746

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
Log:
JBAS-7070

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-07-01 14:01:45 UTC (rev 90745)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-07-01 14:09:08 UTC (rev 90746)
@@ -100,21 +100,22 @@
    @Override
    public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData) throws DeploymentException
    {
+      // Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
+      if(metaData != null && !metaData.isEJB3x())
+      {
+         log.debug("Ignoring legacy EJB deployment " + unit);
+         return;
+      }
+
+      // If this is a war, check scanWars
+      if(unit.getAttachment(JBossWebMetaData.class) != null && scanWars == false)
+      {
+         log.trace("Skipping web deployment: "+unit.getSimpleName());
+         return;            
+      }
+
       try
       {
-         // Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
-         if(metaData != null && (metaData.isEJB2x() || metaData.isEJB1x()))
-         {
-            log.debug("Ignoring legacy EJB deployment " + unit);
-            return;
-         }
-         // If this is a war, check scanWars
-         if(unit.getAttachment(JBossWebMetaData.class) != null && scanWars == false)
-         {
-            log.trace("Skipping web deployment: "+unit.getSimpleName());
-            return;            
-         }
-
          VirtualFile jar = unit.getRoot();
          if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName()))
          {