Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E6A710B84 for ; Tue, 5 May 2015 11:19:54 +0000 (UTC) Received: (qmail 71718 invoked by uid 500); 5 May 2015 11:19:54 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 71698 invoked by uid 500); 5 May 2015 11:19:54 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 71682 invoked by uid 99); 5 May 2015 11:19:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 11:19:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E4DEEAC010F for ; Tue, 5 May 2015 11:19:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1677785 - /openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Date: Tue, 05 May 2015 11:19:53 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150505111953.E4DEEAC010F@hades.apache.org> 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) {