geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r475946 - /geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
Date Thu, 16 Nov 2006 22:12:50 GMT
Author: djencks
Date: Thu Nov 16 14:12:50 2006
New Revision: 475946

URL: http://svn.apache.org/viewvc?view=rev&rev=475946
Log:
GERONIMO-2574 make the SwitchingModuleBuilder willing to hand out a single builder regardless
of of defaultNamespace

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

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?view=diff&rev=475946&r1=475945&r2=475946
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
Thu Nov 16 14:12:50 2006
@@ -132,6 +132,9 @@
         if (builder == null) {
             builder = (ModuleBuilder) namespaceToBuilderMap.get(defaultNamespace);
         }
+        if (builder == null && namespaceToBuilderMap.size() == 1) {
+            builder = (ModuleBuilder) namespaceToBuilderMap.values().iterator().next();
+        }
         return builder;
     }
 



Mime
View raw message