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

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

Author: wolfc
Date: 2007-03-09 06:46:28 -0500 (Fri, 09 Mar 2007)
New Revision: 61237

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
Log:
EJBTHREE-910: AllowedSuffixes had inverted logic

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-03-09 10:16:18 UTC (rev 61236)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-03-09 11:46:28 UTC (rev 61237)
@@ -124,16 +124,10 @@
             log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
             return;
          }
-         if (allowedSuffixes != null)
+         if(!hasAllowedSuffix(jar.getName()))
          {
-            for (String suffix : allowedSuffixes)
-            {
-               if (jar.getName().endsWith(suffix))
-               {
-                  log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
-                  return;
-               }
-            }
+            log.trace("EJBRegistrationDeployer suffix not allowed: " + jar.getName());
+            return;
          }
          log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getName() + " jar: " + jar.getName());
          VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
@@ -174,6 +168,21 @@
       }
    }
 
+   private boolean hasAllowedSuffix(String name)
+   {
+      if(allowedSuffixes == null)
+         return true;
+      
+      for (String suffix : allowedSuffixes)
+      {
+         if (name.endsWith(suffix))
+         {
+            return true;
+         }
+      }
+      return false;
+   }
+   
    public void undeploy(DeploymentUnit unit)
    {
       Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);