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

Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/10/26 03:24:30 UTC

svn commit: r328516 - /geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java

Author: djencks
Date: Tue Oct 25 18:24:26 2005
New Revision: 328516

URL: http://svn.apache.org/viewcvs?rev=328516&view=rev
Log:
finish the previous modification, no builder means we ignore the createModule request

Modified:
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=328516&r1=328515&r2=328516&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Tue Oct 25 18:24:26 2005
@@ -135,7 +135,11 @@
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, URI earConfigId, Object moduleContextInfo) throws DeploymentException {
         String namespace = getNamespaceFromPlan(plan);
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
-        return builder.createModule(plan, moduleFile, targetPath, specDDUrl, earConfigId, moduleContextInfo);
+        if (builder != null) {
+            return builder.createModule(plan, moduleFile, targetPath, specDDUrl, earConfigId, moduleContextInfo);
+        } else {
+            return null;
+        }
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module) throws DeploymentException {