You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2009/05/01 08:35:24 UTC
svn commit: r770549 - in /hadoop/core/trunk: CHANGES.txt
src/core/org/apache/hadoop/io/compress/BZip2Codec.java
src/test/org/apache/hadoop/io/compress/TestCodec.java
Author: dhruba
Date: Fri May 1 06:35:23 2009
New Revision: 770549
URL: http://svn.apache.org/viewvc?rev=770549&view=rev
Log:
HADOOP-5213. Fix Null pointer exception caused when bzip2compression
was used and user closed a output stream without writing any data.
(Zheng Shao via dhruba)
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/BZip2Codec.java
hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=770549&r1=770548&r2=770549&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri May 1 06:35:23 2009
@@ -1431,6 +1431,10 @@
HADOOP-5671. Fix FNF exceptions when copying from old versions of
HftpFileSystem. (Tsz Wo (Nicholas), SZE via cdouglas)
+ HADOOP-5213. Fix Null pointer exception caused when bzip2compression
+ was used and user closed a output stream without writing any data.
+ (Zheng Shao via dhruba)
+
Release 0.19.1 - 2009-02-23
IMPROVEMENTS
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/BZip2Codec.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/BZip2Codec.java?rev=770549&r1=770548&r2=770549&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/BZip2Codec.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/BZip2Codec.java Fri May 1 06:35:23 2009
@@ -169,6 +169,12 @@
}
public void finish() throws IOException {
+ if (needsReset) {
+ // In the case that nothing is written to this stream, we still need to
+ // write out the header before closing, otherwise the stream won't be
+ // recognized by BZip2CompressionInputStream.
+ internalReset();
+ }
this.output.finish();
needsReset = true;
}
@@ -202,6 +208,12 @@
}
public void close() throws IOException {
+ if (needsReset) {
+ // In the case that nothing is written to this stream, we still need to
+ // write out the header before closing, otherwise the stream won't be
+ // recognized by BZip2CompressionInputStream.
+ internalReset();
+ }
this.output.flush();
this.output.close();
needsReset = true;
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java?rev=770549&r1=770548&r2=770549&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java Fri May 1 06:35:23 2009
@@ -53,15 +53,18 @@
private int seed = new Random().nextInt();
public void testDefaultCodec() throws IOException {
+ codecTest(conf, seed, 0, "org.apache.hadoop.io.compress.DefaultCodec");
codecTest(conf, seed, count, "org.apache.hadoop.io.compress.DefaultCodec");
}
public void testGzipCodec() throws IOException {
+ codecTest(conf, seed, 0, "org.apache.hadoop.io.compress.GzipCodec");
codecTest(conf, seed, count, "org.apache.hadoop.io.compress.GzipCodec");
}
- public void testBZip2Codec() throws IOException {
- codecTest(conf, seed, count, "org.apache.hadoop.io.compress.BZip2Codec");
+ public void testBZip2Codec() throws IOException {
+ codecTest(conf, seed, 0, "org.apache.hadoop.io.compress.BZip2Codec");
+ codecTest(conf, seed, count, "org.apache.hadoop.io.compress.BZip2Codec");
}
private static void codecTest(Configuration conf, int seed, int count,
@@ -154,8 +157,9 @@
public void testSequenceFileBZip2Codec() throws IOException, ClassNotFoundException,
InstantiationException, IllegalAccessException {
- sequenceFileCodecTest(conf, 100, "org.apache.hadoop.io.compress.BZip2Codec", 100);
- sequenceFileCodecTest(conf, 200000, "org.apache.hadoop.io.compress.BZip2Codec", 1000000);
+ sequenceFileCodecTest(conf, 0, "org.apache.hadoop.io.compress.BZip2Codec", 100);
+ sequenceFileCodecTest(conf, 100, "org.apache.hadoop.io.compress.BZip2Codec", 100);
+ sequenceFileCodecTest(conf, 200000, "org.apache.hadoop.io.compress.BZip2Codec", 1000000);
}
private static void sequenceFileCodecTest(Configuration conf, int lines,