changeset 1156:d595960acba5

Merge
author asaha
date Thu, 29 Oct 2015 17:08:14 -0700
parents d6e7291ce3d0 (current diff) 12e90773ba27 (diff)
children e43b29e571a4
files .hgtags
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 16 12:16:38 2015 -0700
+++ b/.hgtags	Thu Oct 29 17:08:14 2015 -0700
@@ -496,4 +496,14 @@
 f86ce5ee62ba5d0c91040fa53f0de5b19b20f155 jdk8u71-b01
 7d639191d91cd31b87363ed5383b636bed17f757 jdk8u71-b02
 12b4dcdd76c9b84fed7f6236964075846cb8964e jdk8u71-b03
+79f7e6560ce99eff5745da2a90e75200ca5b4c1e jdk8u71-b04
+15e05a6c32585edd6d2551445735994cb44f948e jdk8u71-b05
+b567f800daaadd47bbf49f69f683b515baeb4d9b jdk8u71-b06
+3cbfc8bd4b1c83e151ba786778e04e8502ea13e4 jdk8u72-b00
+121e784f01d1b658866e499a42288b2f98eeb482 jdk8u72-b01
+c51556c23de38d5f4412622853e643bb8c67d647 jdk8u72-b02
+dddcabf97b4ab156545b3e98d67d6d3e37c8529e jdk8u72-b03
+baa0e7874269223b1726c9b2eccf628d0f72bcfe jdk8u72-b04
+b2b41f383c882ee7a8c2a54dfb0957aa2764d1f8 jdk8u72-b05
+fb0c51afcc55180608f07eb6697d517416ae15da jdk8u72-b06
 7d7b3488f44e77bedbbcbdee5a4415e5a5bd930c jdk8u75-b00
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Fri Oct 16 12:16:38 2015 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Thu Oct 29 17:08:14 2015 -0700
@@ -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;
@@ -239,7 +240,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;
         }
     }