Author: jlaskowski
Date: Fri Dec 14 02:16:05 2007
New Revision: 604145
URL: http://svn.apache.org/viewvc?rev=604145&view=rev
Log:
OPENEJB-735 NPE in AnnotationDeployer if null member is passed into
buildResource()
Contributed by: Joe Bohn
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=604145&r1=604144&r2=604145&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Fri Dec 14 02:16:05 2007
@@ -1380,7 +1380,7 @@
JndiReference reference = consumer.getEnvEntryMap().get(refName);
if (reference == null) {
- { // Little quick validation for common mistake
+ if (member != null) { // Little quick validation for common
mistake
Class type = member.getType();
boolean shouldReturn = false;
if (EntityManager.class.isAssignableFrom(type)){
