Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 67749 invoked from network); 9 Aug 2005 15:30:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Aug 2005 15:30:37 -0000 Received: (qmail 93336 invoked by uid 500); 9 Aug 2005 15:30:35 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 93290 invoked by uid 500); 9 Aug 2005 15:30:35 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 93277 invoked by uid 500); 9 Aug 2005 15:30:34 -0000 Received: (qmail 93273 invoked by uid 99); 9 Aug 2005 15:30:34 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 09 Aug 2005 08:30:34 -0700 Received: (qmail 67729 invoked by uid 1818); 9 Aug 2005 15:30:34 -0000 Date: 9 Aug 2005 15:30:34 -0000 Message-ID: <20050809153034.67728.qmail@minotaur.apache.org> From: mbenson@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs SignJar.java X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N mbenson 2005/08/09 08:30:34 Modified: src/main/org/apache/tools/ant/taskdefs SignJar.java Log: Fix comparison w/ exposed NPE PR: 36093 Obtained from: Dave Brosius Revision Changes Path 1.55 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java Index: SignJar.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- SignJar.java 12 Jun 2005 15:54:14 -0000 1.54 +++ SignJar.java 9 Aug 2005 15:30:34 -0000 1.55 @@ -447,7 +447,7 @@ * @return true if the signedjarFile is considered up to date */ protected boolean isUpToDate(File jarFile, File signedjarFile) { - if (null == jarFile && !jarFile.exists()) { + if (null == jarFile || !jarFile.exists()) { //these are pathological cases, but retained in case somebody //subclassed us. return false; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org