Author: struberg
Date: Wed Jul 21 14:46:50 2010
New Revision: 966262
URL: http://svn.apache.org/viewvc?rev=966262&view=rev
Log:
OWB-410 lazy init ejbInterceptors Map
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=966262&r1=966261&r2=966262&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
Wed Jul 21 14:46:50 2010
@@ -293,17 +293,20 @@ public class CreationalContextImpl<T> im
this.dependentObjects.remove(ownerInstance);
}
-
- List<EjbInterceptorContext> interceptors =
this.ejbInterceptors.get(ownerInstance);
- if(interceptors != null)
+
+ if (this.ejbInterceptors != null)
{
- for(EjbInterceptorContext intereptor : interceptors)
+ List<EjbInterceptorContext> interceptors =
this.ejbInterceptors.get(ownerInstance);
+ if(interceptors != null)
{
- intereptor.getInjectorInstance().destroy();
+ for(EjbInterceptorContext intereptor : interceptors)
+ {
+ intereptor.getInjectorInstance().destroy();
+ }
}
+
+ this.ejbInterceptors.remove(ownerInstance);
}
-
- this.ejbInterceptors.remove(ownerInstance);
}
@SuppressWarnings("unchecked")
@@ -331,7 +334,7 @@ public class CreationalContextImpl<T> im
Collection<List<EjbInterceptorContext>> interceptorValues = null;
if (this.ejbInterceptors != null)
{
- this.ejbInterceptors.values();
+ interceptorValues = this.ejbInterceptors.values();
}
if(interceptorValues != null)
