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

Posted to commits@tomee.apache.org by ke...@apache.org on 2010/08/03 20:16:20 UTC

svn commit: r981994 - /openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Author: kevan
Date: Tue Aug  3 18:16:19 2010
New Revision: 981994

URL: http://svn.apache.org/viewvc?rev=981994&view=rev
Log:
OPENEJB-1315 merge fix to 3.1.x

Modified:
    openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=981994&r1=981993&r2=981994&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Tue Aug  3 18:16:19 2010
@@ -410,10 +410,12 @@ public class JndiEncInfoBuilder {
 
         EjbResolver ejbResolver = getEjbResolver(moduleId);
 
-        for (String ejbName : sessionBean.getDependsOn()) {
-            String deploymentId = ejbResolver.resolve(new SimpleRef(ejbName), moduleUri);
-            if (deploymentId != null) {
-                beanInfo.dependsOn.add(deploymentId);
+        if (sessionBean.getDependsOn() != null) {
+            for (String ejbName : sessionBean.getDependsOn()) {
+                String deploymentId = ejbResolver.resolve(new SimpleRef(ejbName), moduleUri);
+                if (deploymentId != null) {
+                    beanInfo.dependsOn.add(deploymentId);
+                }
             }
         }