Updates PST to support newer JDKs. https://reviews.apache.org/r/43300
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/2078edf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/2078edf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/2078edf8 Branch: refs/heads/master Commit: 2078edf8fd08b95852f42193ea929795407a16c3 Parents: c3e3293 Author: Andreas Kotes <[email protected]> Authored: Sun Feb 7 23:08:52 2016 +0200 Committer: Yuri Zelikov <[email protected]> Committed: Sun Feb 7 23:08:52 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wave/pst/PstFileDescriptor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2078edf8/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..8962b0f 100644 --- a/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java +++ b/pst/src/main/java/org/apache/wave/pst/PstFileDescriptor.java @@ -155,7 +155,14 @@ public final class PstFileDescriptor { return null; } else { // Compiled the file! Now to determine where javac put it. - Pattern pattern = Pattern.compile("\\[wrote ([^\\]]*)\\]"); + Pattern pattern; + if (Integer.parseInt(System.getProperty("java.version").split("\\.")[1]) <= 6) { + // JDK 6 or lower + pattern = Pattern.compile("\\[wrote ([^\\]]*)\\]"); + } else { + // JDK 7 or higher + pattern = Pattern.compile("\\[wrote RegularFileObject\\[([^\\]]*)\\]\\]"); + } String pathToClass = null; for (String line : stdErr) { Matcher lineMatcher = pattern.matcher(line);
