Browse Source

Fixed some JDK 1.1 problems.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267801 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 25 years ago
parent
commit
fa41974df0
2 changed files with 4 additions and 2 deletions
  1. +2
    -0
      src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  2. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java

+ 2
- 0
src/main/org/apache/tools/ant/taskdefs/ExecTask.java View File

@@ -197,6 +197,8 @@ public class ExecTask extends Task {
return new PumpStreamHandler(fos); return new PumpStreamHandler(fos);
} catch (FileNotFoundException fne) { } catch (FileNotFoundException fne) {
throw new BuildException("Cannot write to "+out, fne, location); throw new BuildException("Cannot write to "+out, fne, location);
} catch (IOException ioe) {
throw new BuildException("Cannot write to "+out, ioe, location);
} }
} else { } else {
return new LogStreamHandler(this, return new LogStreamHandler(this,


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java View File

@@ -158,13 +158,13 @@ public class JavaCC extends Task {
} }
} finally { } finally {
if (cleanupHack) { if (cleanupHack) {
final File oo393 = new File(javaFile.getParentFile(),
final File oo393 = new File(javaFile.getParent(),
"OO393.class"); "OO393.class");
if (oo393.exists()) { if (oo393.exists()) {
project.log("Removing stale file: " + oo393.getName()); project.log("Removing stale file: " + oo393.getName());
oo393.delete(); oo393.delete();
} }
final File sunjj = new File(javaFile.getParentFile(),
final File sunjj = new File(javaFile.getParent(),
"__jj" + javaFile.getName().substring(0, "__jj" + javaFile.getName().substring(0,
javaFile.getName().indexOf(".java")) + ".sunjj"); javaFile.getName().indexOf(".java")) + ".sunjj");
if (sunjj.exists()) { if (sunjj.exists()) {


Loading…
Cancel
Save