Author: dblevins
Date: Tue May 26 06:27:51 2009
New Revision: 778568
URL: http://svn.apache.org/viewvc?rev=778568&view=rev
Log:
Seems null is passed in sometimes in the tomcat integration when the listener
is installed. Very strange, but this protects against it.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java?rev=778568&r1=778567&r2=778568&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
Tue May 26 06:27:51 2009
@@ -195,6 +195,7 @@
}
public static Context unwrap(Context context) {
+ if (context == null) return null;
try {
context = (Context) context.lookup("java:comp/env/");
} catch (NamingException notAnIssue) {
