Merge
authorduke
Wed, 05 Jul 2017 20:54:48 +0200
changeset 33016 470068717ae2
parent 33015 9d153359b8ff (diff)
parent 33012 7974c792d22f (current diff)
child 33024 8e7aa0e2c42f
Merge
jdk/src/java.base/share/classes/sun/misc/ConditionLock.java
jdk/src/java.base/share/classes/sun/misc/Lock.java
jdk/src/java.base/share/native/libfdlibm/s_cbrt.c
--- a/jaxws/.hgtags	Wed Jul 05 20:54:42 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 20:54:48 2017 +0200
@@ -332,3 +332,4 @@
 51729143f8fe038f52cf55720c4c1f89267f5948 jdk9-b84
 67b626ec730d2601d95ef036d06be34b37fa9ce6 jdk9-b85
 5289646179079394890a34a898a8ab70fcde0331 jdk9-b86
+f7dba191a38cfc29665b0d77174615a530803297 jdk9-b87
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Wed Jul 05 20:54:42 2017 +0200
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Wed Jul 05 20:54:48 2017 +0200
@@ -30,6 +30,7 @@
 import com.sun.xml.internal.bind.util.Which;
 
 import javax.lang.model.SourceVersion;
+import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
@@ -248,7 +249,12 @@
             if (episode != null)
                 r.setEpisodeFile(episode);
             task.setProcessors(Collections.singleton(r));
-            return task.call();
+            boolean res = task.call();
+            //Print messages generated by compiler
+            for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) {
+                 System.err.println(d.toString());
+            }
+            return res;
         }
     }