Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-28 18:21:03 +01:00
Code Issues Projects Releases Wiki Activity

[#837] Prevent NPE related to Processing

Browse Source 
Fixed NPE when a null runnable was given to Processing.

This occurs when Geolocation gathering is off and register processing
adds a null instead of the IP processor.
This commit is contained in:
Rsl1122 2018-12-09 14:10:04 +02:00
parent 8161488747
commit 3f5551ffaa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/common/src/main/java/com/djrapitops/plan/system/processing/Processing.java
View File

@ -63,7 +63,7 @@ public class Processing implements SubSystem {
} }
public void submitNonCritical(Runnable runnable) { public void submitNonCritical(Runnable runnable) {
if (nonCriticalExecutor.isShutdown()) { if (runnable == null || nonCriticalExecutor.isShutdown()) {
return; return;
} }
CompletableFuture.supplyAsync(() -> { CompletableFuture.supplyAsync(() -> {
@ -73,6 +73,7 @@ public class Processing implements SubSystem {
} }
public void submitCritical(Runnable runnable) { public void submitCritical(Runnable runnable) {
if (runnable == null) return;
CompletableFuture.supplyAsync(() -> { CompletableFuture.supplyAsync(() -> {
runnable.run(); runnable.run();
return true; return true;
@ -87,7 +88,7 @@ public class Processing implements SubSystem {
} }
public <T> Future<T> submitNonCritical(Callable<T> task) { public <T> Future<T> submitNonCritical(Callable<T> task) {
if (nonCriticalExecutor.isShutdown()) { if (task == null || nonCriticalExecutor.isShutdown()) {
return null; return null;
} }
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
@ -114,6 +115,7 @@ public class Processing implements SubSystem {
} }
public <T> Future<T> submitCritical(Callable<T> task) { public <T> Future<T> submitCritical(Callable<T> task) {
if (task == null) return null;
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
try { try {
return task.call(); return task.call();
@ -139,6 +141,7 @@ public class Processing implements SubSystem {
List<Runnable> criticalTasks = criticalExecutor.shutdownNow(); List<Runnable> criticalTasks = criticalExecutor.shutdownNow();
logger.info(locale.get().getString(PluginLang.DISABLED_PROCESSING, criticalTasks.size())); logger.info(locale.get().getString(PluginLang.DISABLED_PROCESSING, criticalTasks.size()));
for (Runnable runnable : criticalTasks) { for (Runnable runnable : criticalTasks) {
if (runnable == null) continue;
try { try {
runnable.run(); runnable.run();
} catch (Exception | NoClassDefFoundError | NoSuchMethodError | NoSuchFieldError e) { } catch (Exception | NoClassDefFoundError | NoSuchMethodError | NoSuchFieldError e) {