potential deadlock with computeIfAbsent #1397

immutables · Aug 25, 2022 · abed126 · abed126
1 parent e2dfb55
commit abed126
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java
@@ -244,8 +244,18 @@ public ImmutableList<InjectionInfo> injectAnnotation() {
     public static MetaAnnotated from(AnnotationMirror mirror, Environment environment) {
       TypeElement element = (TypeElement) mirror.getAnnotationType().asElement();
       String name = element.getQualifiedName().toString();
-      return metaAnnotatedCache()
-          .computeIfAbsent(name, n -> ImmutableProto.MetaAnnotated.of(element, name, environment));
+
+      ConcurrentMap<String, MetaAnnotated> cache = metaAnnotatedCache();
+      @Nullable MetaAnnotated metaAnnotated = cache.get(name);
+      if (metaAnnotated == null) {
+        metaAnnotated = ImmutableProto.MetaAnnotated.of(element, name, environment);
+        @Nullable MetaAnnotated existing = cache.putIfAbsent(name, metaAnnotated);
+        if (existing != null) {
+          metaAnnotated = existing;
+        }
+      }
+
+      return metaAnnotated;
     }
 
     private static ConcurrentMap<String, MetaAnnotated> metaAnnotatedCache() {