--- jsr166/src/test/loops/RWMap.java	2005/05/02 19:19:38	1.1
+++ jsr166/src/test/loops/RWMap.java	2010/10/16 16:22:57	1.6
@@ -1,3 +1,8 @@
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ */
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
@@ -8,75 +13,115 @@ import java.util.concurrent.locks.*;
  * that places read-write locks around unsynchronized Maps.
  * Exists as a sample input for MapLoops test.
  */
-
 public class RWMap implements Map {
     private final Map m;
     private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
-    
+
     public RWMap(Map m) {
         if (m == null)
             throw new NullPointerException();
         this.m = m;
     }
 
-    public RWMap() { 
+    public RWMap() {
         this(new TreeMap()); // use TreeMap by default
+        //        this(new IdentityHashMap());
     }
 
     public int size() {
-        rwl.readLock().lock(); try {return m.size();} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.size(); }
+        finally { l.unlock(); }
     }
-    public boolean isEmpty(){
-        rwl.readLock().lock(); try {return m.isEmpty();} finally { rwl.readLock().unlock(); }
+
+    public boolean isEmpty() {
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.isEmpty(); }
+        finally { l.unlock(); }
     }
 
     public Object get(Object key) {
-        rwl.readLock().lock(); try {return m.get(key);} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.get(key); }
+        finally { l.unlock(); }
     }
 
     public boolean containsKey(Object key) {
-        rwl.readLock().lock(); try {return m.containsKey(key);} finally { rwl.readLock().unlock(); }
-    }
-    public boolean containsValue(Object value){
-        rwl.readLock().lock(); try {return m.containsValue(value);} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.containsKey(key); }
+        finally { l.unlock(); }
     }
 
+    public boolean containsValue(Object value) {
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.containsValue(value); }
+        finally { l.unlock(); }
+    }
 
     public Set keySet() { // Not implemented
         return m.keySet();
     }
-    
+
     public Set entrySet() { // Not implemented
         return m.entrySet();
     }
-    
+
     public Collection values() { // Not implemented
         return m.values();
     }
-    
+
     public boolean equals(Object o) {
-        rwl.readLock().lock(); try {return m.equals(o);} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.equals(o); }
+        finally { l.unlock(); }
     }
+
     public int hashCode() {
-        rwl.readLock().lock(); try {return m.hashCode();} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.hashCode(); }
+        finally { l.unlock(); }
     }
+
     public String toString() {
-        rwl.readLock().lock(); try {return m.toString();} finally { rwl.readLock().unlock(); }
+        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
+        l.lock();
+        try { return m.toString(); }
+        finally { l.unlock(); }
     }
 
-
-
     public Object put(Object key, Object value) {
-        rwl.writeLock().lock(); try {return m.put(key, value);} finally { rwl.writeLock().unlock(); }
+        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
+        l.lock();
+        try { return m.put(key, value); }
+        finally { l.unlock(); }
     }
+
     public Object remove(Object key) {
-        rwl.writeLock().lock(); try {return m.remove(key);} finally { rwl.writeLock().unlock(); }
+        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
+        l.lock();
+        try { return m.remove(key); }
+        finally { l.unlock(); }
     }
+
     public void putAll(Map map) {
-        rwl.writeLock().lock(); try {m.putAll(map);} finally { rwl.writeLock().unlock(); }
+        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
+        l.lock();
+        try { m.putAll(map); }
+        finally { l.unlock(); }
     }
+
     public void clear() {
-        rwl.writeLock().lock(); try {m.clear();} finally { rwl.writeLock().unlock(); }
+        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
+        l.lock();
+        try { m.clear(); }
+        finally { l.unlock(); }
     }
-    
+
 }