You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by db...@apache.org on 2007/02/06 13:45:10 UTC

svn commit: r504113 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Author: dblevins
Date: Tue Feb  6 04:45:06 2007
New Revision: 504113

URL: http://svn.apache.org/viewvc?view=rev&rev=504113
Log:
don't attempt to processes non-ejb modules

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=504113&r1=504112&r2=504113
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Tue Feb  6 04:45:06 2007
@@ -153,9 +153,17 @@
         AppModule appModule = null;
         try {
             appModule = loader.load(file);
+        } catch (UnsupportedOperationException e){
+            // not an ejb module
         } catch (OpenEJBException e) {
             throw new DeploymentException(e);
         }
+
+        if (appModule.getEjbModules().size() == 0){
+            // not an ejb module
+            return null;
+        }
+        
         org.apache.openejb.config.EjbModule ejbModule = appModule.getEjbModules().get(0);