geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r515504 - /geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Wed, 07 Mar 2007 09:20:16 GMT
Author: gdamour
Date: Wed Mar  7 01:20:15 2007
New Revision: 515504

URL: http://svn.apache.org/viewvc?view=rev&rev=515504
Log:
It is only when the module is an EAR, that persistenceUnitBuilders should
be invoked. The previous code was causing a NPE when standalone modules
were built.

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

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=515504&r1=515503&r2=515504
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Wed Mar  7 01:20:15 2007
@@ -559,11 +559,11 @@
                 serviceBuilders.build(geronimoApplication, earContext, earContext);
             }
             
-            // process persistence unit in EAR library directory
-            persistenceUnitBuilders.build(geronimoApplication, earContext, earContext);
-            
-            // Create the J2EEApplication managed object
             if (ConfigurationModuleType.EAR == applicationType) {
+                // process persistence unit in EAR library directory
+                persistenceUnitBuilders.build(geronimoApplication, earContext, earContext);
+                
+                // Create the J2EEApplication managed object
                 GBeanData gbeanData = new GBeanData(earContext.getModuleName(), J2EEApplicationImpl.GBEAN_INFO);
                 try {
                     String originalSpecDD = applicationInfo.getOriginalSpecDD();



Mime
View raw message