From aa9bca02d0469e16a93812564bf44369c30002da Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Mon, 20 Feb 2017 11:08:50 +1000 Subject: [PATCH] Fix NPE in server shutdown when startup failed If server startup fails, the shutdown() routine tries to shut down the logger instance, which may not have been initialised. This raises a NullPointerException which can mask the original exception. Only attempt to shut down the logger instance if it is non-null. --- .../cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index d7d7a3a8974b0810f110aefe6823513a396288c1..4ddb42c67506c727bb52fdc6092a383f87ad22bb 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -1883,7 +1883,8 @@ public class SelfTestSubsystem instance.shutdownSelfTest(); } - mLogger.shutdown(); + if (mLogger != null) + mLogger.shutdown(); } /** -- 2.9.3