Submitted by: Finn Bock <bckfnn@worldonline.dk> git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270014 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -202,6 +202,7 @@ public class JJTree extends Task { | |||||
| final Path classpath = cmdl.createClasspath(project); | final Path classpath = cmdl.createClasspath(project); | ||||
| classpath.createPathElement().setPath(javaccHome.getAbsolutePath() + | classpath.createPathElement().setPath(javaccHome.getAbsolutePath() + | ||||
| "/JavaCC.zip"); | "/JavaCC.zip"); | ||||
| classpath.addJavaRuntime(); | |||||
| final Commandline.Argument arg = cmdl.createVmArgument(); | final Commandline.Argument arg = cmdl.createVmArgument(); | ||||
| arg.setValue("-mx140M"); | arg.setValue("-mx140M"); | ||||
| @@ -245,6 +245,7 @@ public class JavaCC extends Task { | |||||
| final Path classpath = cmdl.createClasspath(project); | final Path classpath = cmdl.createClasspath(project); | ||||
| classpath.createPathElement().setPath(javaccHome.getAbsolutePath() + | classpath.createPathElement().setPath(javaccHome.getAbsolutePath() + | ||||
| "/JavaCC.zip"); | "/JavaCC.zip"); | ||||
| classpath.addJavaRuntime(); | |||||
| final Commandline.Argument arg = cmdl.createVmArgument(); | final Commandline.Argument arg = cmdl.createVmArgument(); | ||||
| arg.setValue("-mx140M"); | arg.setValue("-mx140M"); | ||||
| @@ -496,10 +496,14 @@ public class FileUtils { | |||||
| public File createTempFile(String prefix, String suffix, File parentDir) { | public File createTempFile(String prefix, String suffix, File parentDir) { | ||||
| File result = null; | File result = null; | ||||
| String parent = null; | |||||
| if (parentDir != null) { | |||||
| parent = parentDir.getPath(); | |||||
| } | |||||
| DecimalFormat fmt = new DecimalFormat("#####"); | DecimalFormat fmt = new DecimalFormat("#####"); | ||||
| synchronized (rand) { | synchronized (rand) { | ||||
| do { | do { | ||||
| result = new File(parentDir, | |||||
| result = new File(parent, | |||||
| prefix + fmt.format(rand.nextInt()) | prefix + fmt.format(rand.nextInt()) | ||||
| + suffix); | + suffix); | ||||
| } while (result.exists()); | } while (result.exists()); | ||||