WELD-562

weld · Jul 19, 2010 · dd7e444 · dd7e444
1 parent 3d89eb1
commit dd7e444
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java b/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java
@@ -106,9 +106,16 @@ else if (contextuals.containsKey(contextual))
       }
       else
       {
-         String id = new StringBuilder().append(GENERATED_ID_PREFIX).append(idGenerator.incrementAndGet()).toString();
-         contextuals.put(contextual, id);
-         return id;
+         synchronized (contextual)
+         {
+            if (contextuals.containsKey(contextual))
+            {
+               return contextuals.get(contextual);
+            }
+            String id = new StringBuilder().append(GENERATED_ID_PREFIX).append(idGenerator.incrementAndGet()).toString();
+            contextuals.put(contextual, id);
+            return id;
+         }
       }
    }