Author: dblevins
Date: Sun Apr 1 02:41:33 2012
New Revision: 1308002
URL: http://svn.apache.org/viewvc?rev=1308002&view=rev
Log:
Some nullpointer checks
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=1308002&r1=1308001&r2=1308002&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Sun Apr 1 02:41:33 2012
@@ -408,11 +408,15 @@ public class JndiEncInfoBuilder {
}
private boolean isIntefaceLocalBean(String moduleId, String
interfaceClassName) {
+ if (interfaceClassName == null) return false;
+
EnterpriseBeanInfo beanInfo = getInterfaceBeanInfo(moduleId,
interfaceClassName);
return isLocalBean(beanInfo) &&
beanInfo.parents.contains(interfaceClassName);
}
private EnterpriseBeanInfo getInterfaceBeanInfo(String moduleId, String
interfaceClassName) {
+ if (interfaceClassName == null) throw new
IllegalArgumentException("interfaceClassName cannot be null");
+
List<EjbJarInfo> ejbJars = appInfo.ejbJars;
for (EjbJarInfo ejbJar : ejbJars) {
// DMB Not sure why we don't allow @LocalBean references in other
modules in the EAR
