SteamWar/ProtocolLib
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

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

Quellcode durchsuchen 
May fix issue 181 on BukkitDev.
Dieser Commit ist enthalten in:
Kristian S. Stangeland 2013-12-22 01:01:35 +01:00
Ursprung 5267e73311
Commit d71bea9f8a
1 geänderte Dateien mit 15 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java
Datei anzeigen

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