Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent npe before use.

This commit is contained in:
asofold 2017-04-11 13:16:31 +02:00
parent 53649f9001
commit ea5a064132
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NCPCommons/src/main/java/fr/neatmonster/nocheatplus/utilities/ds/corw/DualCollection.java
View File

@ -175,8 +175,10 @@ public abstract class DualCollection<T, C extends Collection<T>> {
return false;
}
else {
;
lock.lock();
final boolean res = asynchronousCollection.contains(element);
// (Could be set to null within the primary thread.)
final boolean res = asynchronousCollection == null ? false : asynchronousCollection.contains(element);
lock.unlock();
return res;
}
@ -195,15 +197,17 @@ public abstract class DualCollection<T, C extends Collection<T>> {
* Primary thread only.
*/
public void mergePrimaryThread() {
if (asynchronousCollection != null) { // Called from the primary thread anyway.
if (asynchronousCollection != null) { // Opportunistic.
lock.lock();
// (Can only be set to null within the primary thread.)
internalMergePrimaryThreadNoLock();
lock.unlock();
}
}
/**
* Demands asynchronousCollection to be not null. <br>
* Demands asynchronousCollection to be not null, and to be called under
* lock. <br>
* Primary thread only.
*/
private void internalMergePrimaryThreadNoLock() {