From 7d9f4f86d3d5108ee9ff253b1d779cc549764308 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Wed, 1 Dec 2021 06:00:41 -0500 Subject: [PATCH] Fix potential nullpo --- .../SubServers/Bungee/Host/Internal/InternalSubLogger.java | 1 + .../net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java index 72a46f9d..408bfe40 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java @@ -132,6 +132,7 @@ public class InternalSubLogger extends SubLogger { } } + // Log to FILTER log(level, msg); // Log to FILE diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index 4a8fdde6..0dfbcef9 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -141,7 +141,6 @@ public class SubLoggerImpl { } } Process process = this.process; - if (level == null) level = logger.info; if (out == null) (out = new Thread(() -> start(process.getInputStream(), false), SubAPI.getInstance().getAppInfo().getName() + "::Log_Spooler(" + name + ')')).start(); if (err == null) (err = new Thread(() -> start(process.getErrorStream(), true), SubAPI.getInstance().getAppInfo().getName() + "::Error_Spooler(" + name + ')')).start(); } @@ -207,6 +206,8 @@ public class SubLoggerImpl { default: level = logger.info; } + } else if (level == null) { + level = logger.info; } // Log to FILTER