bodewig 00/07/19 06:30:00
Modified: src/main/org/apache/tools/ant/taskdefs ExecTask.java
src/main/org/apache/tools/ant/taskdefs/optional/javacc
JavaCC.java
Log:
Fixed some JDK 1.1 problems.
Revision Changes Path
1.2 +2 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecTask.java 2000/07/19 13:00:31 1.1
+++ ExecTask.java 2000/07/19 13:29:58 1.2
@@ -197,6 +197,8 @@
return new PumpStreamHandler(fos);
} catch (FileNotFoundException fne) {
throw new BuildException("Cannot write to "+out, fne,
location);
+ } catch (IOException ioe) {
+ throw new BuildException("Cannot write to "+out, ioe,
location);
}
} else {
return new LogStreamHandler(this,
1.2 +2 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaCC.java 2000/07/19 13:02:42 1.1
+++ JavaCC.java 2000/07/19 13:29:59 1.2
@@ -158,13 +158,13 @@
}
} finally {
if (cleanupHack) {
- final File oo393 = new File(javaFile.getParentFile(),
+ final File oo393 = new File(javaFile.getParent(),
"OO393.class");
if (oo393.exists()) {
project.log("Removing stale file: " +
oo393.getName());
oo393.delete();
}
- final File sunjj = new File(javaFile.getParentFile(),
+ final File sunjj = new File(javaFile.getParent(),
"__jj" +
javaFile.getName().substring(0,
javaFile.getName().indexOf(".java")) + ".sunjj");
if (sunjj.exists()) {
