Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring putAll to _putAll so the constructor can call the copying in code without running through a subclass' implementation of putAll. Reported in COLLECTIONS-317 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@776542 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2009-05-20 04:30:13 +00:00
parent f7a7f8145d
commit 46f3c54c56
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/org/apache/commons/collections/map/AbstractHashedMap.java
View File

@ -161,7 +161,7 @@ public class AbstractHashedMap extends AbstractMap implements IterableMap {
*/ */
protected AbstractHashedMap(Map map) { protected AbstractHashedMap(Map map) {
this(Math.max(2 * map.size(), DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR); this(Math.max(2 * map.size(), DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR);
putAll(map); _putAll(map);
} }
/** /**
@ -295,6 +295,22 @@ public class AbstractHashedMap extends AbstractMap implements IterableMap {
* @throws NullPointerException if the map is null * @throws NullPointerException if the map is null
*/ */
public void putAll(Map map) { public void putAll(Map map) {
_putAll(map);
}
/**
* Puts all the values from the specified map into this map.
* <p>
* This implementation iterates around the specified map and
* uses {@link #put(Object, Object)}.
* <p>
* It is private to allow the constructor to still call it
* even when putAll is overriden.
*
* @param map the map to add
* @throws NullPointerException if the map is null
*/
private void _putAll(Map map) {
int mapSize = map.size(); int mapSize = map.size();
if (mapSize == 0) { if (mapSize == 0) {
return; return;