Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 73410 invoked from network); 7 Dec 2009 01:43:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Dec 2009 01:43:56 -0000 Received: (qmail 81161 invoked by uid 500); 7 Dec 2009 01:43:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 81086 invoked by uid 500); 7 Dec 2009 01:43:55 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 81077 invoked by uid 99); 7 Dec 2009 01:43:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2009 01:43:55 +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; Mon, 07 Dec 2009 01:43:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B272B2388998; Mon, 7 Dec 2009 01:43:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887816 - /geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java Date: Mon, 07 Dec 2009 01:43:30 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091207014332.B272B2388998@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Dec 7 01:43:28 2009 New Revision: 887816 URL: http://svn.apache.org/viewvc?rev=887816&view=rev Log: some jars don't have manifest file Modified: geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java Modified: geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java?rev=887816&r1=887815&r2=887816&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java Mon Dec 7 01:43:28 2009 @@ -29,17 +29,16 @@ * @version $Rev$ $Date$ */ public class FileUtils { + /** - * Determine whether a file is a JAR File. + * Determine whether a file is a JAR File. + * + * Note: Jar file is a zip file with an *optional* META-INF directory. + * Therefore, there is no reliable way to check if a file is a Jar file. + * So this functions returns the same as calling isZipFile(File). */ public static boolean isJarFile(File file) throws IOException { - if(!isZipFile(file)) { - return false; - } - ZipFile zip = new ZipFile(file); - boolean manifest = zip.getEntry("META-INF/MANIFEST.MF") != null; - zip.close(); - return manifest; + return isZipFile(file); } /**