jboss-remoting-commits November 2009

jboss-remoting-commits@lists.jboss.org

2 participants
34 discussions

JBoss Remoting SVN: r5578 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-02 17:31:39 -0500 (Mon, 02 Nov 2009) New Revision: 5578 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java Log: Compact the copy, if possible Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-11-02 22:18:11 UTC (rev 5577) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-11-02 22:31:39 UTC (rev 5578) @@ -68,7 +68,7 @@ } else { final Map<K, V> copy = copy(map); copy.put(key, value); - this.map = copy; + writeCopy(copy); } return null; } @@ -87,7 +87,7 @@ } else { final Map<K, V> copy = copy(map); copy.remove(key); - this.map = copy; + writeCopy(copy); } return true; } @@ -109,7 +109,7 @@ } else { final Map<K, V> copy = copy(map); copy.put(key, newValue); - this.map = copy; + writeCopy(copy); } return true; } @@ -131,7 +131,7 @@ } else { final Map<K, V> copy = copy(map); copy.put(key, value); - this.map = copy; + writeCopy(copy); } } return old; @@ -173,7 +173,7 @@ } else { final Map<K, V> copy = copy(map); copy.put(key, value); - this.map = copy; + writeCopy(copy); } return old; } @@ -190,7 +190,7 @@ } else { final Map<K, V> copy = copy(map); copy.remove(key); - this.map = copy; + writeCopy(copy); } } return old; @@ -213,17 +213,21 @@ for (Entry<? extends K, ? extends V> entry : orig.entrySet()) { copy.put(entry.getKey(), entry.getValue()); } - if (copy.isEmpty()) { - map = emptyMap(); - } else if (copy.size() == 1) { - final Entry<K, V> entry = copy.entrySet().iterator().next(); - map = singletonMap(entry.getKey(), entry.getValue()); - } else { - map = copy; - } + writeCopy(copy); } } + private void writeCopy(final Map<K, V> copy) { + if (copy.isEmpty()) { + map = emptyMap(); + } else if (copy.size() == 1) { + final Entry<K, V> entry = copy.entrySet().iterator().next(); + map = singletonMap(entry.getKey(), entry.getValue()); + } else { + map = copy; + } + } + public void clear() { synchronized (writeLock) { map = emptyMap();

15 years

1
0
0 / 0

JBoss Remoting SVN: r5577 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-02 17:18:11 -0500 (Mon, 02 Nov 2009) New Revision: 5577 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java Log: Add missing atomic putAll() Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-11-02 22:05:58 UTC (rev 5576) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-11-02 22:18:11 UTC (rev 5577) @@ -201,7 +201,27 @@ return identity ? new IdentityHashMap<K,V>(map) : new HashMap<K, V>(map); } - public void putAll(final Map<? extends K, ? extends V> m) { + public void putAll(final Map<? extends K, ? extends V> orig) { + if (orig == null) { + throw new NullPointerException("map is null"); + } + if (orig.isEmpty()) { + return; + } + synchronized (writeLock) { + final Map<K, V> copy = copy(map); + for (Entry<? extends K, ? extends V> entry : orig.entrySet()) { + copy.put(entry.getKey(), entry.getValue()); + } + if (copy.isEmpty()) { + map = emptyMap(); + } else if (copy.size() == 1) { + final Entry<K, V> entry = copy.entrySet().iterator().next(); + map = singletonMap(entry.getKey(), entry.getValue()); + } else { + map = copy; + } + } } public void clear() {

15 years

1
0
0 / 0

JBoss Remoting SVN: r5576 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2009-11-02 17:05:58 -0500 (Mon, 02 Nov 2009) New Revision: 5576 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java Log: Fix broken copy-on-write-ness Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-10-31 03:22:09 UTC (rev 5575) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/CopyOnWriteHashMap.java 2009-11-02 22:05:58 UTC (rev 5576) @@ -67,7 +67,7 @@ this.map = singletonMap(key, value); } else { final Map<K, V> copy = copy(map); - map.put(key, value); + copy.put(key, value); this.map = copy; } return null; @@ -86,7 +86,7 @@ this.map = emptyMap(); } else { final Map<K, V> copy = copy(map); - map.remove(key); + copy.remove(key); this.map = copy; } return true; @@ -108,7 +108,7 @@ this.map = singletonMap(key, newValue); } else { final Map<K, V> copy = copy(map); - map.put(key, newValue); + copy.put(key, newValue); this.map = copy; } return true; @@ -130,7 +130,7 @@ this.map = singletonMap(key, value); } else { final Map<K, V> copy = copy(map); - map.put(key, value); + copy.put(key, value); this.map = copy; } } @@ -172,7 +172,7 @@ this.map = singletonMap(key, value); } else { final Map<K, V> copy = copy(map); - map.put(key, value); + copy.put(key, value); this.map = copy; } return old; @@ -189,7 +189,7 @@ this.map = emptyMap(); } else { final Map<K, V> copy = copy(map); - map.remove(key); + copy.remove(key); this.map = copy; } }

15 years

1
0
0 / 0

Reminder: Lucio Hopper invited you to join...

by jboss-remoting-commits＠lists.jboss.org

15 years

1
0
0 / 0

← Newer
1
2
3
4
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2009