You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/08/23 13:48:19 UTC
logging-log4j2 git commit: [LOG4J2-2418] NullPointerException when
closing never used RollingRandomAccessFileAppender.
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x 0966b4614 -> 4d4743b7c
[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/4d4743b7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4d4743b7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4d4743b7
Branch: refs/heads/release-2.x
Commit: 4d4743b7c88cd99d143972bbbfb10026b7782972
Parents: 0966b46
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Aug 23 07:48:15 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu Aug 23 07:48:15 2018 -0600
----------------------------------------------------------------------
.../rolling/RollingRandomAccessFileManager.java | 23 +++++++++++---------
src/changes/changes.xml | 3 +++
2 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d4743b7/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..ccbb1a3 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
@@ -162,16 +162,19 @@ 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;
- }
- }
+ public synchronized boolean closeOutputStream() {
+ flush();
+ if (randomAccessFile != null) {
+ try {
+ randomAccessFile.close();
+ return true;
+ } catch (final IOException e) {
+ logError("Unable to close RandomAccessFile", e);
+ return false;
+ }
+ }
+ return true;
+ }
/**
* Returns the buffer capacity.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d4743b7/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 405371e..6708604 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,6 +49,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">