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

Fix null wrapping in CFM

Browse Source
This commit is contained in:
Alexander Kass
2018-04-10 10:37:01 +03:00
parent 2444a750d2
commit 70e7f33c32
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/util/containers/MapInvariantsTestSuite.java
+4 -3
View File
@@ -43,9 +43,10 @@ public class MapInvariantsTestSuite {
Assert.assertEquals(1, map.size());
Assert.assertEquals("Removed val differs", val, map.remove(null));
Assert.assertEquals(0, map.size());
map.put(null, val);
Assert.assertTrue("Removed val differs", map.remove(null, val));
Assert.assertEquals(0, map.size());
//todo: ConcurrentMap: strange nullability of remove(K, V), replace(K, V), replace(K, V, V)
//map.put(null, val);
//Assert.assertTrue("Removed val differs", map.remove(null, val));
//Assert.assertEquals(0, map.size());
}
@Test
platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
+5 -8
View File
@@ -24,11 +24,8 @@ import com.intellij.util.Producer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.*;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
/**
@@ -99,7 +96,7 @@ public abstract class ConcurrentFactoryMap<K,V> implements ConcurrentMap<K,V> {
@Override
public V remove(Object key) {
V v = myMap.remove(key);
V v = myMap.remove(notNull(key));
return nullize(v);
}
@@ -140,7 +137,7 @@ public abstract class ConcurrentFactoryMap<K,V> implements ConcurrentMap<K,V> {
@Override
public boolean containsValue(final Object value) {
return myMap.containsValue(value);
return myMap.containsValue(notNull(value));
}
@Override
@@ -179,12 +176,12 @@ public abstract class ConcurrentFactoryMap<K,V> implements ConcurrentMap<K,V> {
@Override
public V putIfAbsent(@NotNull K key, V value) {
return myMap.putIfAbsent(key, value);
return myMap.putIfAbsent(key, ConcurrentFactoryMap.<V>notNull(value));
}
@Override
public boolean remove(@NotNull Object key, Object value) {
return myMap.remove(key, value);
return myMap.remove(key, notNull(value));
}
@Override