MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

treat concurrent maps with cacheOrGet

Browse Source
This commit is contained in:
Gregory.Shrago
2017-06-07 20:57:00 +03:00
parent 6aab284c25
commit a99bd41d63
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/containers/FactoryMap.java
+8 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.util.containers;
import com.intellij.openapi.util.RecursionGuard;
import com.intellij.openapi.util.RecursionManager;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
import gnu.trove.THashMap;
@@ -24,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
/**
* @author peter
@@ -57,7 +59,12 @@ public abstract class FactoryMap<K,V> implements Map<K, V> {
value = create((K)key);
if (stamp.mayCacheNow()) {
V v = notNull(value);
map.put(k, v);
if (map instanceof ConcurrentMap) {
value = ConcurrencyUtil.cacheOrGet((ConcurrentMap<K, V>)map, k, v);
}
else {
map.put(k, v);
}
}
}
return value == FAKE_NULL() ? null : value;