commit 430b78f569b4957441836937df6d844274c0aad0
author Romain Manni-Bucau <rmannibucau@apache.org> Fri Jan 04 09:59:03 2019 +0000
committer Romain Manni-Bucau <rmannibucau@apache.org> Fri Jan 04 09:59:03 2019 +0000
tree 0d1fba9eac3bae716cc182f28fbd5701096cde31
parent 460b40abf424ad9014c66d5bfe96d28e9671bcd2

MEECROWAVE-169 force WebContextsService in case the user didnt set a contextsservice with CDI SE API

git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/meecrowave/trunk@1850340 13f79535-47bb-0310-9956-ffa450edef68

meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java

diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java b/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java
index f8b3cc1..04c2392 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveSeContainerInitializer.java
@@ -27,7 +27,9 @@
 import org.apache.openwebbeans.se.OWBContainer;
 import org.apache.openwebbeans.se.OWBInitializer;
 import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
 import org.apache.webbeans.spi.ScannerService;
+import org.apache.webbeans.web.context.WebContextsService;
 import org.apache.xbean.finder.filter.Filter;
 
 import javax.enterprise.inject.se.SeContainer;
@@ -117,6 +119,9 @@
     @Override
     protected SeContainer newContainer(final WebBeansContext context) {
         final Meecrowave meecrowave = new Meecrowave(builder);
+        if (!services.containsKey(ContextsService.class.getName())) { // forced otherwise we mess up the env with owb-se
+            context.registerService(ContextsService.class, new WebContextsService(context));
+        }
         return new OWBContainer(context, meecrowave) {
             {
                 meecrowave.bake();