ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/RWMap.java
(Generate patch)

Comparing jsr166/src/test/loops/RWMap.java (file contents):
Revision 1.3 by dl, Sun Aug 7 19:25:55 2005 UTC vs.
Revision 1.4 by dl, Tue Oct 4 20:09:41 2005 UTC

# Line 30 | Line 30 | public class RWMap implements Map {
30      }
31  
32      public int size() {
33 <        rwl.readLock().lock(); try {return m.size();} finally { rwl.readLock().unlock(); }
33 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
34 >        l.lock(); try {return m.size();} finally { l.unlock(); }
35      }
36      public boolean isEmpty(){
37 <        rwl.readLock().lock(); try {return m.isEmpty();} finally { rwl.readLock().unlock(); }
37 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
38 >        l.lock(); try {return m.isEmpty();} finally { l.unlock(); }
39      }
40  
41      public Object get(Object key) {
42 <        rwl.readLock().lock(); try {return m.get(key);} finally { rwl.readLock().unlock(); }
42 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
43 >        l.lock(); try {return m.get(key);} finally { l.unlock(); }
44      }
45  
46      public boolean containsKey(Object key) {
47 <        rwl.readLock().lock(); try {return m.containsKey(key);} finally { rwl.readLock().unlock(); }
47 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
48 >        l.lock(); try {return m.containsKey(key);} finally { l.unlock(); }
49      }
50      public boolean containsValue(Object value){
51 <        rwl.readLock().lock(); try {return m.containsValue(value);} finally { rwl.readLock().unlock(); }
51 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
52 >        l.lock(); try {return m.containsValue(value);} finally { l.unlock(); }
53      }
54  
55  
# Line 61 | Line 66 | public class RWMap implements Map {
66      }
67      
68      public boolean equals(Object o) {
69 <        rwl.readLock().lock(); try {return m.equals(o);} finally { rwl.readLock().unlock(); }
69 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
70 >        l.lock(); try {return m.equals(o);} finally { l.unlock(); }
71      }
72      public int hashCode() {
73 <        rwl.readLock().lock(); try {return m.hashCode();} finally { rwl.readLock().unlock(); }
73 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
74 >        l.lock(); try {return m.hashCode();} finally { l.unlock(); }
75      }
76      public String toString() {
77 <        rwl.readLock().lock(); try {return m.toString();} finally { rwl.readLock().unlock(); }
77 >        ReentrantReadWriteLock.ReadLock l =  rwl.readLock();
78 >        l.lock(); try {return m.toString();} finally { l.unlock(); }
79      }
80  
81  
82  
83      public Object put(Object key, Object value) {
84 <        rwl.writeLock().lock(); try {return m.put(key, value);} finally { rwl.writeLock().unlock(); }
84 >        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
85 >        l.lock(); try {return m.put(key, value);} finally { l.unlock(); }
86      }
87      public Object remove(Object key) {
88 <        rwl.writeLock().lock(); try {return m.remove(key);} finally { rwl.writeLock().unlock(); }
88 >        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
89 >        l.lock(); try {return m.remove(key);} finally { l.unlock(); }
90      }
91      public void putAll(Map map) {
92 <        rwl.writeLock().lock(); try {m.putAll(map);} finally { rwl.writeLock().unlock(); }
92 >        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
93 >        l.lock(); try {m.putAll(map);} finally { l.unlock(); }
94      }
95      public void clear() {
96 <        rwl.writeLock().lock(); try {m.clear();} finally { rwl.writeLock().unlock(); }
96 >        ReentrantReadWriteLock.WriteLock l =  rwl.writeLock();
97 >        l.lock(); try {m.clear();} finally { l.unlock(); }
98      }
99      
100   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines