commit 2078edf8fd08b95852f42193ea929795407a16c3
author Andreas Kotes <count-apache.org@flatline.de> Sun Feb 07 23:08:52 2016 +0200
committer Yuri Zelikov <yurize@apache.org> Sun Feb 07 23:08:52 2016 +0200
tree 25113c3a6120dedac7ee3eacaa7e6839f49f95c6
parent c3e32934bc073c2e9bc53d01943bf3df80b9e22c

Updates PST to support newer JDKs. https://reviews.apache.org/r/43300

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 @@
         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);