infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 05:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

8222930: ConcurrentSkipListMap.clone() shares size variable between original and clone

Browse Source 
Co-authored-by: Martin Buchholz <martinrb@google.com>
Reviewed-by: martin, smarks
This commit is contained in:
Adam Farley8 2019-05-02 06:33:28 -07:00 committed by Doug Lea
parent 7d4520c109
commit d97dd4d554
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
View File

@ -1129,6 +1129,7 @@ public class ConcurrentSkipListMap<K,V> extends AbstractMap<K,V>
clone.entrySet = null;
clone.values = null;
clone.descendingMap = null;
clone.adder = null;
clone.buildFromSorted(this);
return clone;
} catch (CloneNotSupportedException e) {

26
test/jdk/java/util/concurrent/tck/MapTest.java
View File

@ -200,6 +200,32 @@ public class MapTest extends JSR166TestCase {
assertEquals(size1 + size2, m1.size());
}
/**
* 8222930: ConcurrentSkipListMap.clone() shares size variable between original and clone
*/
public void testClone() {
final ThreadLocalRandom rnd = ThreadLocalRandom.current();
final int size = rnd.nextInt(4);
final Map map = impl.emptyMap();
for (int i = 0; i < size; i++)
map.put(impl.makeKey(i), impl.makeValue(i));
final Map clone = cloneableClone(map);
if (clone == null) return; // not cloneable?
assertEquals(size, map.size());
assertEquals(size, clone.size());
assertEquals(map.isEmpty(), clone.isEmpty());
clone.put(impl.makeKey(-1), impl.makeValue(-1));
assertEquals(size, map.size());
assertEquals(size + 1, clone.size());
clone.clear();
assertEquals(size, map.size());
assertEquals(0, clone.size());
assertTrue(clone.isEmpty());
}
// public void testFailsIntentionallyForDebugging() {
// fail(impl.klazz().getSimpleName());
// }