From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 10 Jun 2008 17:43:28 +0000 (+0000)
Subject: prevent NPE during shutdown where the logger has been shutdown and delayed resources... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1815d494448f5196f1b99c70d44ada7769d6c20e;p=tomcat7.0

prevent NPE during shutdown where the logger has been shutdown and delayed resources still trying to log
java.lang.NullPointerException
	at org.apache.juli.FileHandler.publish(FileHandler.java:136)



git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@666232 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java
index 587440fa7..eb23fb564 100644
--- a/java/org/apache/juli/FileHandler.java
+++ b/java/org/apache/juli/FileHandler.java
@@ -133,8 +133,12 @@ public class FileHandler
         }
         
         try {
-            writer.write(result);
-            writer.flush();
+            if (writer!=null) {
+                writer.write(result);
+                writer.flush();
+            } else {
+                reportError("FileHandler is closed or not yet initialized, unable to log ["+result+"]", null, ErrorManager.WRITE_FAILURE);
+            }
         } catch (Exception e) {
             reportError(null, e, ErrorManager.WRITE_FAILURE);
             return;