diff -Naur a/src/java/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java b/src/java/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java
--- a/src/java/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java 2014-05-14 16:52:52.967571704 +0300
+++ b/src/java/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java 2014-05-14 17:20:45.893634182 +0300
@@ -656,7 +656,7 @@
* null
.
*/
public Object remove(Object key) {
- return remove(key, null);
+ return removeMapping(key, null);
}
@@ -675,7 +675,7 @@
* null
.
*/
- protected Object remove(Object key, Object value) {
+ protected Object removeMapping(Object key, Object value) {
/*
Find the entry, then
1. Set value field to null, to force get() to retry
@@ -946,7 +946,7 @@
if (!(o instanceof Map.Entry))
return false;
Map.Entry e = (Map.Entry)o;
- return ConcurrentHashMap.this.remove(e.getKey(), e.getValue()) != null;
+ return ConcurrentHashMap.this.removeMapping(e.getKey(), e.getValue()) != null;
}
public int size() {
return ConcurrentHashMap.this.size();