eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

classlib: properly duplicate inner map when cloning TreeMap

Browse Source
This commit is contained in:
Bernd Busse 2023-07-27 20:59:30 +02:00 committed by Alexey Andreev
parent 2318caad7b
commit 6a398c9b8d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java
View File

@ -16,6 +16,7 @@
package org.teavm.classlib.java.util; package org.teavm.classlib.java.util;
import org.teavm.classlib.java.io.TSerializable; import org.teavm.classlib.java.io.TSerializable;
import org.teavm.classlib.java.lang.TCloneNotSupportedException;
import org.teavm.classlib.java.lang.TCloneable; import org.teavm.classlib.java.lang.TCloneable;
public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TSerializable, TNavigableMap<K, V> { public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TSerializable, TNavigableMap<K, V> {
@ -558,10 +559,19 @@ public class TTreeMap<K, V> extends TAbstractMap<K, V> implements TCloneable, TS
} }
@Override @Override
@SuppressWarnings("unchecked")
public Object clone() { public Object clone() {
TTreeMap<?, ?> copy = (TTreeMap<?, ?>) super.clone(); try {
copy.cachedEntrySet = null; TTreeMap<K, V> map = (TTreeMap<K, V>) super.clone();
return copy; map.root = null;
map.modCount = 0;
map.cachedEntrySet = null;
map.putAll(this);
return map;
} catch (TCloneNotSupportedException e) {
return null;
}
} }
static class EntrySet<K, V> extends TAbstractSet<Entry<K, V>> implements TSequencedSet<Entry<K, V>> { static class EntrySet<K, V> extends TAbstractSet<Entry<K, V>> implements TSequencedSet<Entry<K, V>> {

4
tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java
View File

@ -215,6 +215,10 @@ public class TreeMapTest {
Set<Object> key2 = map2.keySet(); Set<Object> key2 = map2.keySet();
assertTrue("keySet() is identical", key2 != keys); assertTrue("keySet() is identical", key2 != keys);
assertEquals("keySet() was not cloned", "key2", key2.iterator().next()); assertEquals("keySet() was not cloned", "key2", key2.iterator().next());
@SuppressWarnings("unchecked")
Map<Object, Object> map3 = (Map<Object, Object>) map.clone();
map3.put("key2", "value2");
assertFalse("Original map modified through clone", map.containsKey("key2"));
} }
@Test @Test