You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/07 13:19:10 UTC

[34/38] logging-log4j2 git commit: Minor clean ups.

Minor clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6d416f9c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6d416f9c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6d416f9c

Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 6d416f9cb47e50d25aeb0d98639d2ba6e6a2cc56
Parents: d1c02ee
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Aug 5 21:01:32 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Aug 5 21:01:32 2016 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/appender/FileManager.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d416f9c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index 060f2db..3bb4f6c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -202,6 +202,7 @@ public class FileManager extends OutputStreamManager {
          * @param data The FactoryData
          * @return The FileManager for the File.
          */
+        @SuppressWarnings("resource")
         @Override
         public FileManager createManager(final String name, final FactoryData data) {
             final File file = new File(name);
@@ -211,12 +212,11 @@ public class FileManager extends OutputStreamManager {
             }
 
             final boolean writeHeader = !data.append || !file.exists();
-            OutputStream os;
             try {
-                os = new FileOutputStream(name, data.append);
+                final FileOutputStream fos = new FileOutputStream(name, data.append);
                 final int actualSize = data.bufferedIO ? data.bufferSize : Constants.ENCODER_BYTE_BUFFER_SIZE;
                 final ByteBuffer buffer = ByteBuffer.wrap(new byte[actualSize]);
-                return new FileManager(name, os, data.append, data.locking, data.advertiseURI, data.layout,
+                return new FileManager(name, fos, data.append, data.locking, data.advertiseURI, data.layout,
                         writeHeader, buffer);
             } catch (final FileNotFoundException ex) {
                 LOGGER.error("FileManager (" + name + ") " + ex, ex);