context propagation restart fix

michalszynkiewicz · May 28, 2019 · 2826929 · 2826929
1 parent f438459
commit 2826929
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationTemplate.java b/...src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationTemplate.java
@@ -23,10 +23,17 @@ public class SmallRyeContextPropagationTemplate {
     public void configureStaticInit(List<ThreadContextProvider> discoveredProviders,
             List<ContextManagerExtension> discoveredExtensions) {
         // build the manager at static init time
-        ContextManagerProvider contextManagerProvider = new SmallRyeContextManagerProvider();
-        ContextManagerProvider.register(contextManagerProvider);
+        try {
+            ContextManagerProvider.instance();
+            // the previous line will throw if already configured
+            ContextManagerProvider contextManagerProvider = new SmallRyeContextManagerProvider();
+            ContextManagerProvider.register(contextManagerProvider);
+        } catch (IllegalStateException ignored) {
+            // already set
+        }
+
         // do what config we can here, but we need the runtime executor service to finish
-        builder = (SmallRyeContextManager.Builder) contextManagerProvider
+        builder = (SmallRyeContextManager.Builder) ContextManagerProvider.instance()
                 .getContextManagerBuilder();
         builder.withThreadContextProviders(discoveredProviders.toArray(new ThreadContextProvider[0]));
         builder.withContextManagerExtensions(discoveredExtensions.toArray(new ContextManagerExtension[0]));