You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/06/01 18:54:52 UTC
svn commit: r1832711 - in
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal:
container/RuntimeExtension.java model/FactoryActivator.java
model/SingleActivator.java
Author: rotty3000
Date: Fri Jun 1 18:54:51 2018
New Revision: 1832711
URL: http://svn.apache.org/viewvc?rev=1832711&view=rev
Log:
[CDI] solve shutdown BeanManager
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java?rev=1832711&r1=1832710&r2=1832711&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java Fri Jun 1 18:54:51 2018
@@ -141,6 +141,8 @@ public class RuntimeExtension implements
void beforeShutdown(@Observes BeforeShutdown bs) {
_log.debug(l -> l.debug("CCR BeforeShutdown on {}", _containerState.bundle()));
+ _containerState.beanManager(null);
+
_configurationListeners.removeIf(
cl -> {
_containerState.submit(cl.closeOp(), cl::close).onFailure(
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java?rev=1832711&r1=1832710&r2=1832711&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/FactoryActivator.java Fri Jun 1 18:54:51 2018
@@ -109,6 +109,10 @@ public class FactoryActivator extends In
final BeanManager beanManager = containerState.beanManager();
+ if (beanManager == null) {
+ return false;
+ }
+
ExtendedActivationTemplateDTO activationTemplate =
(ExtendedActivationTemplateDTO)instance.template.activations.get(0);
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java?rev=1832711&r1=1832710&r2=1832711&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java Fri Jun 1 18:54:51 2018
@@ -108,6 +108,10 @@ public class SingleActivator extends Ins
final BeanManager beanManager = containerState.beanManager();
+ if (beanManager == null) {
+ return false;
+ }
+
ExtendedActivationTemplateDTO activationTemplate =
(ExtendedActivationTemplateDTO)instance.template.activations.get(0);