HADOOP-14097. Remove Java6 specific code from GzipCodec.java. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50decd36 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50decd36 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50decd36 Branch: refs/heads/HADOOP-13345 Commit: 50decd36130945e184734dcd55b8912be6f4550a Parents: e60c654 Author: Akira Ajisaka <aajis...@apache.org> Authored: Sat Feb 25 00:28:31 2017 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Sat Feb 25 00:28:31 2017 +0900 ---------------------------------------------------------------------- .../apache/hadoop/io/compress/GzipCodec.java | 59 -------------------- 1 file changed, 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/50decd36/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java index 01b6434..d079412 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java @@ -45,10 +45,6 @@ public class GzipCodec extends DefaultCodec { protected static class GzipOutputStream extends CompressorStream { private static class ResetableGZIPOutputStream extends GZIPOutputStream { - private static final int TRAILER_SIZE = 8; - public static final String JVMVersion= System.getProperty("java.version"); - private static final boolean HAS_BROKEN_FINISH = - (IBM_JAVA && JVMVersion.contains("1.6.0")); public ResetableGZIPOutputStream(OutputStream out) throws IOException { super(out); @@ -57,61 +53,6 @@ public class GzipCodec extends DefaultCodec { public void resetState() throws IOException { def.reset(); } - - /** - * Override this method for HADOOP-8419. - * Override because IBM implementation calls def.end() which - * causes problem when reseting the stream for reuse. - * - */ - @Override - public void finish() throws IOException { - if (HAS_BROKEN_FINISH) { - if (!def.finished()) { - def.finish(); - while (!def.finished()) { - int i = def.deflate(this.buf, 0, this.buf.length); - if ((def.finished()) && (i <= this.buf.length - TRAILER_SIZE)) { - writeTrailer(this.buf, i); - i += TRAILER_SIZE; - out.write(this.buf, 0, i); - - return; - } - if (i > 0) { - out.write(this.buf, 0, i); - } - } - - byte[] arrayOfByte = new byte[TRAILER_SIZE]; - writeTrailer(arrayOfByte, 0); - out.write(arrayOfByte); - } - } else { - super.finish(); - } - } - - /** re-implement for HADOOP-8419 because the relative method in jdk is invisible */ - private void writeTrailer(byte[] paramArrayOfByte, int paramInt) - throws IOException { - writeInt((int)this.crc.getValue(), paramArrayOfByte, paramInt); - writeInt(this.def.getTotalIn(), paramArrayOfByte, paramInt + 4); - } - - /** re-implement for HADOOP-8419 because the relative method in jdk is invisible */ - private void writeInt(int paramInt1, byte[] paramArrayOfByte, int paramInt2) - throws IOException { - writeShort(paramInt1 & 0xFFFF, paramArrayOfByte, paramInt2); - writeShort(paramInt1 >> 16 & 0xFFFF, paramArrayOfByte, paramInt2 + 2); - } - - /** re-implement for HADOOP-8419 because the relative method in jdk is invisible */ - private void writeShort(int paramInt1, byte[] paramArrayOfByte, int paramInt2) - throws IOException { - paramArrayOfByte[paramInt2] = (byte)(paramInt1 & 0xFF); - paramArrayOfByte[(paramInt2 + 1)] = (byte)(paramInt1 >> 8 & 0xFF); - } } public GzipOutputStream(OutputStream out) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org