deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject git commit: DELTASPIKE-669 Shutdown contexts before destroying the bean.
Date Wed, 06 Aug 2014 02:26:41 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master d74c387d2 -> 8e12cac01


DELTASPIKE-669 Shutdown contexts before destroying the bean.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8e12cac0
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8e12cac0
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8e12cac0

Branch: refs/heads/master
Commit: 8e12cac015e7ca014a36a6f656b26e0af7c8f7f9
Parents: d74c387
Author: John D. Ament <johndament@apache.org>
Authored: Tue Aug 5 22:26:36 2014 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Tue Aug 5 22:26:36 2014 -0400

----------------------------------------------------------------------
 .../apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java   | 2 +-
 .../apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java  | 1 +
 .../org/apache/deltaspike/cdise/weld/WeldContainerControl.java     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e12cac0/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
index 1f5382f..59408a0 100644
--- a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
+++ b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
@@ -115,8 +115,8 @@ public class OpenEjbContainerControl implements CdiContainer
     {
         if (ctxCtrl != null)
         {
+            ctxCtrl.stopContexts();
             ctxCtrlBean.destroy(ctxCtrl, ctxCtrlCreationalContext);
-
         }
 
         if (context != null)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e12cac0/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
index 6b7fe48..11ca596 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
@@ -80,6 +80,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
     {
         if (ctxCtrl != null)
         {
+            ctxCtrl.stopContexts();
             ctxCtrlBean.destroy(ctxCtrl, ctxCtrlCreationalContext);
         }
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e12cac0/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
index a193aa8..ccec4be 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
@@ -78,6 +78,7 @@ public class WeldContainerControl implements CdiContainer
     {
         if (ctxCtrl != null)
         {
+            ctxCtrl.stopContexts();
             ctxCtrlBean.destroy(ctxCtrl, ctxCtrlCreationalContext);
         }
 


Mime
View raw message