bodewig 00/12/18 07:53:55
Modified: src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Avoid NullPointerException in JDK 1.1
Revision Changes Path
1.24 +7 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Zip.java 2000/12/13 09:48:33 1.23
+++ Zip.java 2000/12/18 15:53:52 1.24
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -486,7 +486,12 @@
while (!directories.isEmpty()) {
String dir = (String) directories.pop();
- File f = new File(baseDir, dir);
+ File f = null;
+ if (baseDir != null) {
+ f = new File(baseDir, dir);
+ } else {
+ f = new File(dir);
+ }
zipDir(f, zOut, prefix+dir);
}
}
