WELD-2585 Synchronize creation of conversation ID generator to avoid …

…race conditions.
weld · Aug 5, 2019 · 11680ac · 11680ac
1 parent cd3df05
commit 11680ac
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/contexts/AbstractConversationContext.java b/impl/src/main/java/org/jboss/weld/contexts/AbstractConversationContext.java
@@ -418,7 +418,8 @@ public String generateConversationId() {
         return generator.call();
     }
 
-    protected ConversationIdGenerator getConversationIdGenerator() {
+    // method is synchronized so that creation of conversation generator isn't a subject to race condition
+    protected synchronized ConversationIdGenerator getConversationIdGenerator() {
         final R request = associated.get();
         if (request == null) {
             throw ConversationLogger.LOG.mustCallAssociateBeforeGeneratingId();
@@ -464,7 +465,7 @@ private void checkIsAssociated() {
         }
     }
 
-    private Map<String, ManagedConversation> getConversationMap() {
+    private synchronized Map<String, ManagedConversation> getConversationMap() {
         checkIsAssociated();
         checkContextInitialized();
         final R request = getRequest();