organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9422 fix remove problem

Browse source 
X-SVN-Rev: 32045
This commit is contained in:
Mark Davis 2012-07-19 21:23:41 +00:00
parent a41775b429
commit 5a8800843a
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Relation.java
View file

@ -181,17 +181,27 @@ public class Relation<K, V> implements Freezable { // TODO: add , Map<K, Collect
}
public Set<V> removeAll(K key) {
return data.remove(key);
try {
return data.remove(key);
} catch (NullPointerException e) {
return null; // data doesn't allow null, eg ConcurrentHashMap
}
}
public boolean remove(K key, V value) {
Set<V> set = data.get(key);
if (set == null) return false;
boolean result = set.remove(value);
if (set.size() == 0) {
data.remove(key);
try {
Set<V> set = data.get(key);
if (set == null) {
return false;
}
boolean result = set.remove(value);
if (set.size() == 0) {
data.remove(key);
}
return result;
} catch (NullPointerException e) {
return false; // data doesn't allow null, eg ConcurrentHashMap
}
return result;
}
public int size() {
@ -286,16 +296,20 @@ public class Relation<K, V> implements Freezable { // TODO: add , Map<K, Collect
public boolean removeAll(Relation<K, V> toBeRemoved) {
boolean result = false;
for (K key : toBeRemoved.keySet()) {
Set<V> values = toBeRemoved.getAll(key);
if (values != null) {
result |= removeAll(key, values);
try {
Set<V> values = toBeRemoved.getAll(key);
if (values != null) {
result |= removeAll(key, values);
}
} catch (NullPointerException e) {
// data doesn't allow null, eg ConcurrentHashMap
}
}
return result;
}
public Set<V> removeAll(K... keys) {
return data.remove(Arrays.asList(keys));
return removeAll(Arrays.asList(keys));
}
public boolean removeAll(K key, Iterable<V> toBeRemoved) {
@ -309,9 +323,13 @@ public class Relation<K, V> implements Freezable { // TODO: add , Map<K, Collect
public Set<V> removeAll(Collection<K> toBeRemoved) {
Set<V> result = new LinkedHashSet();
for (K key : toBeRemoved) {
final Set<V> removals = data.remove(key);
if (removals != null) {
result.addAll(removals);
try {
final Set<V> removals = data.remove(key);
if (removals != null) {
result.addAll(removals);
}
} catch (NullPointerException e) {
// data doesn't allow null, eg ConcurrentHashMap
}
}
return result;