Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LinkedCaseInsensitiveMap properly overrides HashMap.clone()

Browse Source 
Issue: SPR-14509
(cherry picked from commit 6459559)
This commit is contained in:
Juergen Hoeller
2016-07-25 12:08:55 +02:00
parent f1fc74c4ec
commit dadd2c3709
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
View File

@@ -36,7 +36,7 @@ import java.util.Map;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> { public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
private final Map<String, String> caseInsensitiveKeys; private Map<String, String> caseInsensitiveKeys;
private final Locale locale; private final Locale locale;
@@ -151,6 +151,14 @@ public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
super.clear(); super.clear();
} }
@Override
@SuppressWarnings("unchecked")
public Object clone() {
LinkedCaseInsensitiveMap<V> copy = (LinkedCaseInsensitiveMap<V>) super.clone();
copy.caseInsensitiveKeys = new HashMap<String, String>(this.caseInsensitiveKeys);
return copy;
}
/** /**
* Convert the given key to a case-insensitive key. * Convert the given key to a case-insensitive key.

22
spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
View File

@@ -74,4 +74,26 @@ public class LinkedCaseInsensitiveMapTests {
assertEquals("N", map.getOrDefault(new Object(), "N")); assertEquals("N", map.getOrDefault(new Object(), "N"));
} }
@Test
@SuppressWarnings("unchecked")
public void mapClone() {
map.put("key", "value1");
LinkedCaseInsensitiveMap<String> copy = (LinkedCaseInsensitiveMap<String>) map.clone();
assertEquals("value1", map.get("key"));
assertEquals("value1", map.get("KEY"));
assertEquals("value1", map.get("Key"));
assertEquals("value1", copy.get("key"));
assertEquals("value1", copy.get("KEY"));
assertEquals("value1", copy.get("Key"));
copy.put("Key", "value2");
assertEquals(1, map.size());
assertEquals(1, copy.size());
assertEquals("value1", map.get("key"));
assertEquals("value1", map.get("KEY"));
assertEquals("value1", map.get("Key"));
assertEquals("value2", copy.get("key"));
assertEquals("value2", copy.get("KEY"));
assertEquals("value2", copy.get("Key"));
}
} }