whitespace changes
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/53f6d42f Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/53f6d42f Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/53f6d42f Branch: refs/heads/master Commit: 53f6d42f748d771d5269aec5c377d5058e8cdf4c Parents: 16e358e Author: Stefan Bodewig <[email protected]> Authored: Sun Jul 1 11:54:29 2018 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun Jul 1 11:54:29 2018 +0200 ---------------------------------------------------------------------- .../archivers/ar/ArArchiveOutputStream.java | 10 +++++----- .../archivers/cpio/CpioArchiveOutputStream.java | 14 +++++++------- .../archivers/sevenz/SevenZOutputFile.java | 8 ++++---- .../archivers/tar/TarArchiveOutputStream.java | 14 +++++++------- .../archivers/zip/ScatterZipOutputStream.java | 4 ++-- .../archivers/zip/ZipArchiveOutputStream.java | 20 ++++++++++---------- .../bzip2/BZip2CompressorOutputStream.java | 4 ++-- .../Deflate64CompressorInputStream.java | 10 +++++----- .../gzip/GzipCompressorOutputStream.java | 8 ++++---- .../lz4/BlockLZ4CompressorOutputStream.java | 4 ++-- .../lz4/FramedLZ4CompressorInputStream.java | 10 +++++----- .../lz4/FramedLZ4CompressorOutputStream.java | 4 ++-- .../pack200/Pack200CompressorOutputStream.java | 12 ++++++------ .../pack200/TempFileCachingStreamBridge.java | 4 ++-- .../FramedSnappyCompressorInputStream.java | 10 +++++----- .../FramedSnappyCompressorOutputStream.java | 4 ++-- .../snappy/SnappyCompressorOutputStream.java | 4 ++-- .../FileBasedScatterGatherBackingStore.java | 4 ++-- .../utils/FixedLengthBlockOutputStream.java | 4 ++-- 19 files changed, 76 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java index b7988bf..57acb71 100644 --- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java @@ -207,12 +207,12 @@ public class ArArchiveOutputStream extends ArchiveOutputStream { @Override public void close() throws IOException { try { - if(!finished) { - finish(); - } + if (!finished) { + finish(); + } } finally { - out.close(); - prevEntry = null; + out.close(); + prevEntry = null; } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java index 9fe399b..c0e04c4 100644 --- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java @@ -483,14 +483,14 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements @Override public void close() throws IOException { try { - if(!finished) { - finish(); - } + if (!finished) { + finish(); + } } finally { - if (!this.closed) { - out.close(); - this.closed = true; - } + if (!this.closed) { + out.close(); + this.closed = true; + } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java index c997067..db47f44 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java @@ -131,11 +131,11 @@ public class SevenZOutputFile implements Closeable { @Override public void close() throws IOException { try { - if (!finished) { - finish(); - } + if (!finished) { + finish(); + } } finally { - channel.close(); + channel.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java index fd74d46..c750e22 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java @@ -303,14 +303,14 @@ public class TarArchiveOutputStream extends ArchiveOutputStream { @Override public void close() throws IOException { try { - if (!finished) { - finish(); - } + if (!finished) { + finish(); + } } finally { - if (!closed) { - out.close(); - closed = true; - } + if (!closed) { + out.close(); + closed = true; + } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java index b801bf8..7001c84 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java @@ -125,9 +125,9 @@ public class ScatterZipOutputStream implements Closeable { @Override public void close() throws IOException { try { - backingStore.close(); + backingStore.close(); } finally { - streamCompressor.close(); + streamCompressor.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java index 8ca1538..584bb46 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java @@ -959,11 +959,11 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { @Override public void close() throws IOException { try { - if (!finished) { - finish(); - } + if (!finished) { + finish(); + } } finally { - destroy(); + destroy(); } } @@ -1601,13 +1601,13 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { */ void destroy() throws IOException { try { - if (channel != null) { - channel.close(); - } + if (channel != null) { + channel.close(); + } } finally { - if (out != null) { - out.close(); - } + if (out != null) { + out.close(); + } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java index 02fe273..cccf38d 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java @@ -502,9 +502,9 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream if (!closed) { final OutputStream outShadow = this.out; try { - finish(); + finish(); } finally { - outShadow.close(); + outShadow.close(); } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java index 5ed6e58..8cbe44d 100644 --- a/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java @@ -96,12 +96,12 @@ public class Deflate64CompressorInputStream extends CompressorInputStream implem @Override public void close() throws IOException { try { - closeDecoder(); + closeDecoder(); } finally { - if (originalStream != null) { - originalStream.close(); - originalStream = null; - } + if (originalStream != null) { + originalStream.close(); + originalStream = null; + } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java index 711612b..bb5e177 100644 --- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java @@ -205,11 +205,11 @@ public class GzipCompressorOutputStream extends CompressorOutputStream { public void close() throws IOException { if (!closed) { try { - finish(); + finish(); } finally { - deflater.end(); - out.close(); - closed = true; + deflater.end(); + out.close(); + closed = true; } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java index f5b9253..7f24300 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java @@ -145,9 +145,9 @@ public class BlockLZ4CompressorOutputStream extends CompressorOutputStream { @Override public void close() throws IOException { try { - finish(); + finish(); } finally { - os.close(); + os.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java index e366815..6cb66ec 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java @@ -127,12 +127,12 @@ public class FramedLZ4CompressorInputStream extends CompressorInputStream @Override public void close() throws IOException { try { - if (currentBlock != null) { - currentBlock.close(); - currentBlock = null; - } + if (currentBlock != null) { + currentBlock.close(); + currentBlock = null; + } } finally { - in.close(); + in.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java index a2d23e2..4bd0023 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java @@ -227,9 +227,9 @@ public class FramedLZ4CompressorOutputStream extends CompressorOutputStream { @Override public void close() throws IOException { try { - finish(); + finish(); } finally { - out.close(); + out.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java index 6c3bff9..e5be87b 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java @@ -115,13 +115,13 @@ public class Pack200CompressorOutputStream extends CompressorOutputStream { @Override public void close() throws IOException { try { - finish(); + finish(); } finally { - try { - streamBridge.stop(); - } finally { - originalOutput.close(); - } + try { + streamBridge.stop(); + } finally { + originalOutput.close(); + } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java index c056e5d..27ed211 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java @@ -46,9 +46,9 @@ class TempFileCachingStreamBridge extends StreamBridge { @Override public void close() throws IOException { try { - super.close(); + super.close(); } finally { - f.delete(); + f.delete(); } } }; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java index 8949d5e..f6dc30c 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java @@ -145,12 +145,12 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream @Override public void close() throws IOException { try { - if (currentCompressedChunk != null) { - currentCompressedChunk.close(); - currentCompressedChunk = null; - } + if (currentCompressedChunk != null) { + currentCompressedChunk.close(); + currentCompressedChunk = null; + } } finally { - in.close(); + in.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java index 932069b..4449b28 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java @@ -103,9 +103,9 @@ public class FramedSnappyCompressorOutputStream extends CompressorOutputStream { @Override public void close() throws IOException { try { - finish(); + finish(); } finally { - out.close(); + out.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java index bfe47ce..0c7b3b1 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java @@ -131,9 +131,9 @@ public class SnappyCompressorOutputStream extends CompressorOutputStream { @Override public void close() throws IOException { try { - finish(); + finish(); } finally { - os.close(); + os.close(); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java b/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java index 9a9a1db..a9105f0 100644 --- a/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java +++ b/src/main/java/org/apache/commons/compress/parallel/FileBasedScatterGatherBackingStore.java @@ -68,9 +68,9 @@ public class FileBasedScatterGatherBackingStore implements ScatterGatherBackingS @Override public void close() throws IOException { try { - closeForWriting(); + closeForWriting(); } finally { - target.delete(); + target.delete(); } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/53f6d42f/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java index 17e8a0c..360f380 100644 --- a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java +++ b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java @@ -184,9 +184,9 @@ public class FixedLengthBlockOutputStream extends OutputStream implements Writab public void close() throws IOException { if (closed.compareAndSet(false, true)) { try { - flushBlock(); + flushBlock(); } finally { - out.close(); + out.close(); } } }
