Author: struberg
Date: Tue May 5 11:19:53 2015
New Revision: 1677785
URL: http://svn.apache.org/r1677785
Log:
OWB-1050 only destroy context if it is still active
The context can be de-activated if there was an overlap
of container events. Better guard ourselves than relying on
containers to do this properly...
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1677785&r1=1677784&r2=1677785&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
Tue May 5 11:19:53 2015
@@ -476,7 +476,7 @@ public class WebContextsService extends
}
// Destroy context
- if (context != null)
+ if (context != null && context.isActive())
{
if (supportsConversation)
{
