geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1155226 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Date Tue, 09 Aug 2011 06:33:45 GMT
Author: genspring
Date: Tue Aug  9 06:33:45 2011
New Revision: 1155226

URL: http://svn.apache.org/viewvc?rev=1155226&view=rev
Log:
GEROGRONIMO-6016 Geronimo can't handle well when modules in ear has the same name.

Only rename the module when there are more than 2 modules in ear.

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

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1155226&r1=1155225&r2=1155226&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Tue Aug  9 06:33:45 2011
@@ -1165,7 +1165,7 @@ public class EjbModuleBuilder implements
         // add enc
         String moduleName = module.getName();
         
-        if (earContext.getSubModuleNames().contains(moduleName)){
+        if (earContext.getSubModuleNames().size() > 1 && earContext.getSubModuleNames().contains(moduleName)){
             log.warn("Duplicated moduleName: '"+moduleName +"' is found ! deployer will rename
it to: '"+moduleName +
                     "_duplicated' , please check your modules in application to make sure
they don't share the same name");
             moduleName = moduleName +"_duplicated";



Mime
View raw message