Author: remy.maucherat(a)jboss.com Date: 2008-06-12 10:11:25 -0400 (Thu, 12 Jun 2008) New Revision: 666 Modified: trunk/java/org/apache/juli/FileHandler.java Log: - Patch port. - Fix possible logging NPE on shutdown. Modified: trunk/java/org/apache/juli/FileHandler.java =================================================================== --- trunk/java/org/apache/juli/FileHandler.java 2008-06-12 14:10:53 UTC (rev 665) +++ trunk/java/org/apache/juli/FileHandler.java 2008-06-12 14:11:25 UTC (rev 666) @@ -133,8 +133,12 @@ } 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;