Repository: logging-log4j2 Updated Branches: refs/heads/master 99c40d3ed -> 6d1fc5309
[LOG4J2-2418] NullPointerException when closing never used RollingRandomAccessFileAppender. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6d1fc530 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6d1fc530 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6d1fc530 Branch: refs/heads/master Commit: 6d1fc53098a60f837fca9e3e0b9d297a40c1920a Parents: 99c40d3 Author: Gary Gregory <[email protected]> Authored: Thu Aug 23 07:51:54 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Thu Aug 23 07:51:54 2018 -0600 ---------------------------------------------------------------------- .../rolling/RollingRandomAccessFileManager.java | 15 +++++++++------ src/changes/changes.xml | 6 ++++++ 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d1fc530/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index e8b6cb9..8d3e52e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -164,13 +164,16 @@ public class RollingRandomAccessFileManager extends RollingFileManager { @Override public synchronized boolean closeOutputStream() { flush(); - try { - randomAccessFile.close(); - return true; - } catch (final IOException e) { - logError("Unable to close RandomAccessFile", e); - return false; + if (randomAccessFile != null) { + try { + randomAccessFile.close(); + return true; + } catch (final IOException e) { + logError("Unable to close RandomAccessFile", e); + return false; + } } + return true; } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d1fc530/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 088372d..59c0643 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -239,6 +239,9 @@ <action issue="LOG4J2-2201" dev="ckozak" type="fix"> Fix memory leak in ReusableParameterizedMessage. </action> + <action issue="LOG4J2-2418" dev="ggregory" type="fix" due-to="Jonas Rutishauser"> + NullPointerException when closing never used RollingRandomAccessFileAppender. + </action> </release> <release version="2.11.2" date="2018-MM-DD" description="GA Release 2.11.2"> <action issue="LOG4J2-2391" dev="ckozak" type="update"> @@ -259,6 +262,9 @@ <action issue="LOG4J2-2363" dev="ckozak" type="fix" due-to="Brian Laub"> ReusableObjectMessage parameter is properly passed to appenders (#203). </action> + <action issue="LOG4J2-2418" dev="ggregory" type="fix" due-to="Jonas Rutishauser"> + NullPointerException when closing never used RollingRandomAccessFileAppender. + </action> </release> <release version="2.11.1" date="2018-07-22" description="GA Release 2.11.1"> <action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">
