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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
