Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 66676 invoked from network); 19 Feb 2010 12:33:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Feb 2010 12:33:50 -0000 Received: (qmail 84795 invoked by uid 500); 19 Feb 2010 12:33:50 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 84726 invoked by uid 500); 19 Feb 2010 12:33:49 -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 84717 invoked by uid 99); 19 Feb 2010 12:33:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 12:33:49 +0000 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; Fri, 19 Feb 2010 12:33:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DA5D623889EC; Fri, 19 Feb 2010 12:33:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911798 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip: ZipArchiveInputStream.java ZipArchiveOutputStream.java Date: Fri, 19 Feb 2010 12:33:28 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100219123328.DA5D623889EC@eris.apache.org> Author: bodewig Date: Fri Feb 19 12:33:28 2010 New Revision: 911798 URL: http://svn.apache.org/viewvc?rev=911798&view=rev Log: if it's not a ZipArchiveEntry then the stream can't read/write it Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=911798&r1=911797&r2=911798&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java Fri Feb 19 12:33:28 2010 @@ -203,7 +203,7 @@ (ze.getMethod() == ZipArchiveEntry.STORED || ze.getMethod() == ZipArchiveEntry.DEFLATED); } - return super.canRead(ae); + return false; } public int read(byte[] buffer, int start, int length) throws IOException { Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=911798&r1=911797&r2=911798&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Fri Feb 19 12:33:28 2010 @@ -517,7 +517,7 @@ return !ze.isEncrypted() && (ze.getMethod() == STORED || ze.getMethod() == DEFLATED); } - return super.canWrite(ae); + return false; } /**