From a6cbbbeeebd98b6e7bd3934da38b8629257687f7 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 Nov 2015 11:09:21 +0000
Subject: [PATCH] OPENDJ-2474 Fix NPE when stopping server with not fully started server

---
 opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
index a7d1dd2..f8560ef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogger.java
@@ -128,7 +128,11 @@
   public final synchronized void removeAllLogPublishers()
   {
     loggerStorage.removeAllLogPublishers();
-    getServerContext().getCommonAudit().shutdown();
+    // Access logger may have not been fully initialized
+    if (getServerContext() != null && getServerContext().getCommonAudit() != null)
+    {
+      getServerContext().getCommonAudit().shutdown();
+    }
   }
 
 }

--
Gitblit v1.10.0