Merge pull request #4043 from arjantijms/PAYARA-3928-CDI-event-npe

PAYARA-3928 Fix NPE when notification via CDI eventbus comes in
payara · Jun 14, 2019 · 69c4de8 · 69c4de8
2 parents 3526be0 + ec81477
commit 69c4de8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...current-impl/src/main/java/org/glassfish/concurrent/runtime/ContextSetupProviderImpl.java b/...current-impl/src/main/java/org/glassfish/concurrent/runtime/ContextSetupProviderImpl.java
@@ -236,7 +236,7 @@ else if(backupClassLoader != null) {
             transactionManager.clearThreadTx();
         }
 
-        if (requestTracing != null && requestTracing.isRequestTracingEnabled()) {
+        if (requestTracing != null && requestTracing.isRequestTracingEnabled() && handle.getSpanContextMap() != null) {
             startConcurrentContextSpan(invocation, handle);
         }