umagesh 2002/08/19 08:17:00
Modified: . Tag: ANT_15_BRANCH WHATSNEW build.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Checksum.java
Log:
Fixed Broken checksum condition fileset handling
PR: 11675
Submitted by: Chris Nokleberg ([EMAIL PROTECTED])
========================================
Prepare for 1.5.1Beta1
Revision Changes Path
No revision
No revision
1.263.2.71 +5 -2 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.70
retrieving revision 1.263.2.71
diff -u -r1.263.2.70 -r1.263.2.71
--- WHATSNEW 9 Aug 2002 08:39:47 -0000 1.263.2.70
+++ WHATSNEW 19 Aug 2002 15:17:00 -0000 1.263.2.71
@@ -1,9 +1,12 @@
-Changes from Ant 1.5 to current CVS version
-===========================================
+Changes from Ant 1.5 to current 1.5Beta1
+========================================
Fixed bugs:
-----------
+* Checksum was broken in the following scenario:
+ (using verifyproperty OR in a condition) AND using filesets
+ with multiple files.
* The ExpandProperties filter threw NPEs when defined using
the <filterreader> format.
1.304.2.29 +2 -2 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.304.2.28
retrieving revision 1.304.2.29
diff -u -r1.304.2.28 -r1.304.2.29
--- build.xml 5 Aug 2002 08:31:28 -0000 1.304.2.28
+++ build.xml 19 Aug 2002 15:17:00 -0000 1.304.2.29
@@ -2,7 +2,7 @@
<!--
=======================================================================
- Apache Ant own build file
+ Apache Ant own build file
Copyright (c) 2000-2002 The Apache Software Foundation. All rights
reserved.
@@ -20,7 +20,7 @@
<property name="Name" value="Apache Ant"/>
<property name="name" value="ant"/>
- <property name="version" value="1.5.1alpha"/>
+ <property name="version" value="1.5.1beta1"/>
<property name="manifest-version" value="1.5.0.1"/>
<property name="debug" value="true" />
No revision
No revision
1.22.2.3 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -r1.22.2.2 -r1.22.2.3
--- Checksum.java 19 Jun 2002 00:03:16 -0000 1.22.2.2
+++ Checksum.java 19 Aug 2002 15:17:00 -0000 1.22.2.3
@@ -398,7 +398,8 @@
if (destination instanceof java.lang.String) {
String prop = (String) destination;
if (isCondition) {
- checksumMatches = checksum.equals(property);
+ checksumMatches = checksumMatches &&
+ checksum.equals(property);
} else {
project.setNewProperty(prop, checksum);
}
@@ -414,7 +415,7 @@
fis = null;
br.close();
isr.close();
- checksumMatches =
+ checksumMatches = checksumMatches &&
checksum.equals(suppliedChecksum);
} else {
checksumMatches = false;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
