You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/03/25 18:23:22 UTC
svn commit: r927511 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
Author: struberg
Date: Thu Mar 25 17:23:22 2010
New Revision: 927511
URL: http://svn.apache.org/viewvc?rev=927511&view=rev
Log:
OWB-337 only create contextual instance if the context is active
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=927511&r1=927510&r2=927511&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Thu Mar 25 17:23:22 2010
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
@@ -198,7 +199,17 @@ public class ObserverMethodImpl<T> imple
{
BeanManagerImpl manager = BeanManagerImpl.getManager();
specializedComponent = (AbstractOwbBean<Object>)WebBeansUtil.getMostSpecializedBean(manager, baseComponent);
- Context context = manager.getContext(specializedComponent.getScope());
+ Context context = null;
+ try
+ {
+ context = manager.getContext(specializedComponent.getScope());
+ }
+ catch (ContextNotActiveException cnae)
+ {
+ // this may happen if we try to e.g. send an event to a @ConversationScoped bean from a ServletListener
+ logger.info("cannot send event to bean in non active context: " + bean.toString());
+ return;
+ }
creationalContext = manager.createCreationalContext(specializedComponent);
@@ -225,9 +236,9 @@ public class ObserverMethodImpl<T> imple
finally
{
//Destory bean instance
- if (baseComponent.getScope().equals(Dependent.class))
+ if (baseComponent.getScope().equals(Dependent.class) && object != null)
{
- baseComponent.destroy(object,(CreationalContext<Object>)creationalContext);
+ baseComponent.destroy(object,creationalContext);
}
//Destroy observer method dependent instances