geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r518243 - /geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
Date Wed, 14 Mar 2007 18:00:14 GMT
Author: kevan
Date: Wed Mar 14 11:00:13 2007
New Revision: 518243

URL: http://svn.apache.org/viewvc?view=rev&rev=518243
Log:
Fix NPE in CorbaModuleBuilderExtension

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

Modified: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java?view=diff&rev=518243&r1=518242&r2=518243
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
Wed Mar 14 11:00:13 2007
@@ -101,9 +101,11 @@
             EjbModule ejbModule = (EjbModule) module;
             OpenejbGeronimoEjbJarType jarInfo = ejbModule.getVendorDD(); 
 
-            OpenejbTssLinkType[] links = jarInfo.getTssLinkArray(); 
-            if (links != null && links.length > 0) {
-                EnvironmentBuilder.mergeEnvironments(environment, this.defaultEnvironment);
+            if (jarInfo != null) {
+                OpenejbTssLinkType[] links = jarInfo.getTssLinkArray(); 
+                if (links != null && links.length > 0) {
+                    EnvironmentBuilder.mergeEnvironments(environment, this.defaultEnvironment);
+                }
             }
         }        
     }



Mime
View raw message