You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2010/08/03 17:16:41 UTC
svn commit: r981920 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Author: kmalhi
Date: Tue Aug 3 15:16:39 2010
New Revision: 981920
URL: http://svn.apache.org/viewvc?rev=981920&view=rev
Log:
Applying patch from Shawn Jiang for OPENEJB-1315. Thanks Shawn
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=981920&r1=981919&r2=981920&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Tue Aug 3 15:16:39 2010
@@ -390,10 +390,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);
+ }
}
}