peterreilly 2003/11/20 05:34:13
Modified: src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
FileUtils.java
Log:
Sync with head
Revision Changes Path
No revision
No revision
1.56.2.2 +3 -3 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -r1.56.2.1 -r1.56.2.2
--- FileUtils.java 25 Sep 2003 12:36:31 -0000 1.56.2.1
+++ FileUtils.java 20 Nov 2003 13:34:12 -0000 1.56.2.2
@@ -545,7 +545,7 @@
// ensure that parent dir of dest file exists!
// not using getParentFile method to stay 1.1 compat
File parent = getParentFile(destFile);
- if (!parent.exists()) {
+ if (parent != null && !parent.exists()) {
parent.mkdirs();
}
@@ -1380,7 +1380,7 @@
}
File parent = getParentFile(to);
- if (!parent.exists() && !parent.mkdirs()) {
+ if (parent != null && !parent.exists() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent
+ " while trying to rename " + from);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
