commit becb94826b4d1e6c15bdf2aa4d8b610ed65173e8
author rmannibucau <rmannibucau@unknown> Tue Feb 12 08:52:12 2019 +0000
committer rmannibucau <rmannibucau@unknown> Tue Feb 12 08:52:12 2019 +0000
tree 1f0de5078c4ccf18b6e94a9dd10e59d400c4e646
parent c54f29922a7bec9d0deb1452712220388eb114ae

MEECROWAVE-182 OWB-1280 ensure deployClasspath and deployWebapp respect both the same configuration (consumers, initializers)

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

meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java

diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index c4152ca..61a5fd1 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -189,14 +189,7 @@
         }
 
         final ProvidedLoader loader = new ProvidedLoader(classLoader, configuration.isTomcatWrapLoader());
-        final Consumer<Context> builtInCustomizer = c -> {
-            c.setLoader(loader);
-            if (configuration.antiResourceLocking && StandardContext.class.isInstance(c)) {
-                StandardContext.class.cast(c).setAntiResourceLocking(true);
-            }
-            configuration.getInitializers().forEach(i -> c.addServletContainerInitializer(i, emptySet()));
-            configuration.getGlobalContextConfigurers().forEach(it -> it.accept(c));
-        };
+        final Consumer<Context> builtInCustomizer = c -> c.setLoader(loader);
         return deployWebapp(new DeploymentMeta(meta.context, meta.docBase, ofNullable(meta.consumer).map(c -> (Consumer<Context>) ctx -> {
             builtInCustomizer.accept(ctx);
             c.accept(ctx);
@@ -404,6 +397,11 @@
         }
 
         ofNullable(meta.consumer).ifPresent(c -> c.accept(ctx));
+        if (configuration.antiResourceLocking && StandardContext.class.isInstance(ctx)) {
+            StandardContext.class.cast(ctx).setAntiResourceLocking(true);
+        }
+        configuration.getInitializers().forEach(i -> ctx.addServletContainerInitializer(i, emptySet()));
+        configuration.getGlobalContextConfigurers().forEach(it -> it.accept(ctx));
 
         final Host host = tomcat.getHost();
         host.addChild(ctx);