Author: chatellier Date: 2009-05-01 17:07:26 +0000 (Fri, 01 May 2009) New Revision: 1461 Modified: lutinutil/trunk/src/main/java/org/codelutin/util/Tbz2Util.java lutinutil/trunk/src/test/java/org/codelutin/util/Tbz2UtilTest.java Log: Test to create md5 after compression (not on the fly). Modified: lutinutil/trunk/src/main/java/org/codelutin/util/Tbz2Util.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/Tbz2Util.java 2009-05-01 16:30:52 UTC (rev 1460) +++ lutinutil/trunk/src/main/java/org/codelutin/util/Tbz2Util.java 2009-05-01 17:07:26 UTC (rev 1461) @@ -177,11 +177,6 @@ try { OutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("bzip2", tbz2os); - // if md5 creation flag - if (createMD5) { - cos = new MD5OutputStream(cos); - } - ArchiveOutputStream os = new ArchiveStreamFactory() .createArchiveOutputStream("tar", cos); @@ -206,16 +201,18 @@ } os.finish(); os.close(); + cos.close(); tbz2os.close(); // if md5 creation flag if (createMD5) { - String md5hash = MD5.asHex(((MD5OutputStream) cos).hash()); + MD5InputStream in = new MD5InputStream(new FileInputStream(tbz2File)); + String md5hash = MD5.asHex(in.hash()); + in.close(); File md5File = new File(tbz2File.getAbsoluteFile() + ".md5"); FileUtil.writeString(md5File, md5hash); } - - cos.close(); + } catch (ArchiveException e) { throw new IOException("Can't archive as tar", e); } catch (CompressorException e) { Modified: lutinutil/trunk/src/test/java/org/codelutin/util/Tbz2UtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/Tbz2UtilTest.java 2009-05-01 16:30:52 UTC (rev 1460) +++ lutinutil/trunk/src/test/java/org/codelutin/util/Tbz2UtilTest.java 2009-05-01 17:07:26 UTC (rev 1461) @@ -154,7 +154,7 @@ md5File.deleteOnExit(); Assert.assertTrue(md5File.exists()); String md5sum = FileUtil.readAsString(md5File); - Assert.assertEquals("a123ec9800d08cd5a12317fa306ee7e4", md5sum); + Assert.assertEquals("d41d8cd98f00b204e9800998ecf8427e", md5sum); } }