Repository: logging-log4j2 Updated Branches: refs/heads/master 21da4aac4 -> c15882eb5
Use Java 7 try-with-resources. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c15882eb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c15882eb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c15882eb Branch: refs/heads/master Commit: c15882eb59827cbd16add6816349b5ce2175057d Parents: 21da4aa Author: Gary Gregory <[email protected]> Authored: Sat Jun 13 15:19:01 2015 -0700 Committer: Gary Gregory <[email protected]> Committed: Sat Jun 13 15:19:01 2015 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/GelfLayout.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c15882eb/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index 17e4ec2..19ab128 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -155,13 +155,13 @@ public final class GelfLayout extends AbstractStringLayout { private byte[] compress(final byte[] bytes) { try { final ByteArrayOutputStream baos = new ByteArrayOutputStream(compressionThreshold / 8); - final DeflaterOutputStream stream = compressionType.createDeflaterOutputStream(baos); - if (stream == null) { - return bytes; + try (final DeflaterOutputStream stream = compressionType.createDeflaterOutputStream(baos)) { + if (stream == null) { + return bytes; + } + stream.write(bytes); + stream.finish(); } - stream.write(bytes); - stream.finish(); - stream.close(); return baos.toByteArray(); } catch (final IOException e) { StatusLogger.getLogger().error(e);
