Refactor duplicate call. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e7823826 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e7823826 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e7823826
Branch: refs/heads/LOG4J2-1986 Commit: e7823826b6d04cd92d23dfe8b9ca5c5beefbb1aa Parents: 1de6a88 Author: Gary Gregory <[email protected]> Authored: Tue Jul 25 18:35:12 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Tue Jul 25 18:35:12 2017 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/rolling/DefaultRolloverStrategy.java | 2 +- .../core/appender/rolling/DirectWriteRolloverStrategy.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e7823826/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java index dbaf546..dfacd72 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java @@ -549,7 +549,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { tempCompressedFilePattern.formatFileName(strSubstitutor, buf, fileIndex); final String tmpCompressedName = buf.toString(); final File tmpCompressedNameFile = new File(tmpCompressedName); - File parentFile = tmpCompressedNameFile.getParentFile(); + final File parentFile = tmpCompressedNameFile.getParentFile(); if (parentFile != null) { parentFile.mkdirs(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e7823826/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java index 8c30738..b1ee506 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java @@ -355,8 +355,9 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem tempCompressedFilePattern.formatFileName(strSubstitutor, buf, fileIndex); final String tmpCompressedName = buf.toString(); final File tmpCompressedNameFile = new File(tmpCompressedName); - if (tmpCompressedNameFile.getParentFile() != null) { - tmpCompressedNameFile.getParentFile().mkdirs(); + final File parentFile = tmpCompressedNameFile.getParentFile(); + if (parentFile != null) { + parentFile.mkdirs(); } compressAction = new CompositeAction( Arrays.asList(fileExtension.createCompressAction(sourceName, tmpCompressedName,
