Repository: incubator-wave Updated Branches: refs/heads/master ed4feb701 -> b29549612
don't use additional temp directory if that isn't necessary Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/2c075c64 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/2c075c64 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/2c075c64 Branch: refs/heads/master Commit: 2c075c6474ac36c7b3d7b92780da13e12cf0c89c Parents: 3644593 Author: Andreas 'count' Kotes <co...@flatline.de> Authored: Tue Feb 2 16:39:19 2016 +0100 Committer: Andreas 'count' Kotes <co...@flatline.de> Committed: Tue Feb 2 16:39:19 2016 +0100 ---------------------------------------------------------------------- pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2c075c64/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java ---------------------------------------------------------------------- diff --git a/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java b/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java index 499ebc5..7dafc70 100644 --- a/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java +++ b/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java @@ -76,7 +76,7 @@ public final class PstFileDescriptor { if (path.endsWith(".class")) { clazz = fromPathToClass(path); } else if (path.endsWith(".java")) { - clazz = fromPathToJava(path); + clazz = fromPathToJava(path, intermediateJavaDir); } else if (path.endsWith(".proto")) { clazz = fromPathToProto(path, intermediateJavaDir, protoPath); } else { @@ -134,9 +134,9 @@ public final class PstFileDescriptor { return path.replace(File.separatorChar, '.').substring(0, path.length() - ".class".length()); } - private Class<?> fromPathToJava(String pathToJava) { + private Class<?> fromPathToJava(String pathToJava, File intermediateJavaDir) { try { - File dir = Files.createTempDir(); + File dir = intermediateJavaDir; String[] javacCommand = new String[] { "javac", pathToJava, "-d", dir.getAbsolutePath(), "-verbose", "-cp", determineClasspath(pathToJava) + ":" + determineSystemClasspath() @@ -267,7 +267,7 @@ public final class PstFileDescriptor { System.err.println("ERROR: couldn't find result of protoc in " + intermediateJavaDir); return null; } - return fromPathToJava(maybeJavaFilePath); + return fromPathToJava(maybeJavaFilePath, intermediateJavaDir); } } catch (Exception e) { System.err.println("WARNING: exception while processing " + pathToProto + ": "
