Better-formatted message during copy operation, and make
Project.toBoolean handle null.
-Jesse
--
Jesse Glick <mailto:[EMAIL PROTECTED]>
NetBeans, Open APIs <http://www.netbeans.org/>
tel (+4202) 3300-9161 Sun Micro x49161 Praha CR
Index: src/main/org/apache/tools/ant/Project.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.52
diff -u -r1.52 Project.java
--- src/main/org/apache/tools/ant/Project.java 2001/01/18 02:50:32 1.52
+++ src/main/org/apache/tools/ant/Project.java 2001/01/25 11:58:51
@@ -739,7 +741,7 @@
if (overwrite ||
destFile.lastModified() < sourceFile.lastModified()) {
- log("Copy: " + sourceFile.getAbsolutePath() + " > "
+ log("Copy: " + sourceFile.getAbsolutePath() + " -> "
+ destFile.getAbsolutePath(), MSG_VERBOSE);
// ensure that parent dir of dest file exists!
@@ -882,7 +884,7 @@
* if either "on", "true", or "yes" is found, ignoring case.
*/
public static boolean toBoolean(String s) {
- return (s.equalsIgnoreCase("on") ||
+ return s != null && (s.equalsIgnoreCase("on") ||
s.equalsIgnoreCase("true") ||
s.equalsIgnoreCase("yes"));
}
