Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 95845 invoked from network); 12 Feb 2009 10:27:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2009 10:27:36 -0000 Received: (qmail 23058 invoked by uid 500); 12 Feb 2009 10:27:34 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 23002 invoked by uid 500); 12 Feb 2009 10:27:34 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 22993 invoked by uid 99); 12 Feb 2009 10:27:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 02:27:34 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 10:27:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6DC28238896F; Thu, 12 Feb 2009 10:27:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r743678 - in /commons/sandbox/compress/trunk/src: main/java/org/apache/commons/compress/compressors/bzip2/ test/resources/ Date: Thu, 12 Feb 2009 10:27:11 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090212102711.6DC28238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Thu Feb 12 10:27:10 2009 New Revision: 743678 URL: http://svn.apache.org/viewvc?rev=743678&view=rev Log: use proper BZip2 signature, SANDBOX-285 Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java commons/sandbox/compress/trunk/src/test/resources/bla.txt.bz2 Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java?rev=743678&r1=743677&r2=743678&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java Thu Feb 12 10:27:10 2009 @@ -218,12 +218,9 @@ if (in.available() == 0) { throw new IOException("Empty InputStream"); } - int magic2 = this.in.read(); - if (magic2 != 'h') { - throw new IOException("Stream is not BZip2 formatted: expected 'h'" - + " as first byte but got '" + (char) magic2 - + "'"); - } + checkMagicChar('B', "first"); + checkMagicChar('Z', "second"); + checkMagicChar('h', "third"); int blockSize = this.in.read(); if ((blockSize < '1') || (blockSize > '9')) { @@ -237,6 +234,17 @@ setupBlock(); } + private void checkMagicChar(char expected, String position) + throws IOException { + int magic = this.in.read(); + if (magic != expected) { + throw new IOException("Stream is not BZip2 formatted: expected '" + + expected + "' as " + position + + " byte but got '" + (char) magic + + "'"); + } + } + private void initBlock() throws IOException { char magic0 = bsGetUByte(); char magic1 = bsGetUByte(); Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java?rev=743678&r1=743677&r2=743678&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java Thu Feb 12 10:27:10 2009 @@ -405,6 +405,8 @@ bytesOut = 0; nBlocksRandomised = 0; + bsPutUChar('B'); + bsPutUChar('Z'); /* Write `magic' bytes h indicating file-format == huffmanised, followed by a digit indicating blockSize100k. */ Modified: commons/sandbox/compress/trunk/src/test/resources/bla.txt.bz2 URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/resources/bla.txt.bz2?rev=743678&r1=743677&r2=743678&view=diff ============================================================================== Binary files - no diff available.