From 56c522501ac8ac27afd50889a4553e318728980a Mon Sep 17 00:00:00 2001 From: Simon Danner Date: Sat, 13 Jun 2020 16:00:00 +0200 Subject: [PATCH] Only main CDI container should reset cdi control producer on shutdown --- ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java index 51e0ce1..d0f19b4 100644 --- a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java +++ b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java @@ -218,7 +218,8 @@ public SeContainer getContainer() public void shutdown() { container.close(); - CDI_CONTROL = null; + if (this == CDI_CONTROL) + CDI_CONTROL = null; } /**