Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-09-11 23:28:04 +02:00
Code Issues Projects Releases Wiki Activity

Don't pass NULL to ConcurrentHashMap when reading or removing.

Browse Source 
May fix issue 181 on BukkitDev.
This commit is contained in:
Kristian S. Stangeland 2013-12-22 01:01:35 +01:00
parent 5267e73311
commit d71bea9f8a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java
View File

@ -223,10 +223,13 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
public TValue remove(Object key) {
if (key instanceof Player) {
Object playerKey = keyMethod.apply((Player) key);
TValue value = valueLookup.remove(playerKey);
keyLookup.remove(playerKey);
return value;
if (playerKey != null) {
TValue value = valueLookup.remove(playerKey);
keyLookup.remove(playerKey);
return value;
}
}
return null;
}
@ -236,7 +239,7 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
if (key instanceof Player) {
Object playerKey = keyMethod.apply((Player) key);
if (valueLookup.remove(playerKey, value)) {
if (playerKey != null && valueLookup.remove(playerKey, value)) {
keyLookup.remove(playerKey);
return true;
}
@ -246,15 +249,19 @@ public class ConcurrentPlayerMap<TValue> extends AbstractMap<Player, TValue> imp
@Override
public TValue get(Object key) {
if (key instanceof Player)
return valueLookup.get(keyMethod.apply((Player) key));
if (key instanceof Player) {
Object playerKey = keyMethod.apply((Player) key);
return playerKey != null ? valueLookup.get(playerKey) : null;
}
return null;
}
@Override
public boolean containsKey(Object key) {
if (key instanceof Player)
return valueLookup.containsKey(keyMethod.apply((Player) key));
if (key instanceof Player) {
Object playerKey = keyMethod.apply((Player) key);
return playerKey != null && valueLookup.containsKey(playerKey);
}
return false;
}