Thu, 29 Oct 2015 17:08:14 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Fri Oct 16 12:16:38 2015 -0700 1.2 +++ b/.hgtags Thu Oct 29 17:08:14 2015 -0700 1.3 @@ -496,4 +496,14 @@ 1.4 f86ce5ee62ba5d0c91040fa53f0de5b19b20f155 jdk8u71-b01 1.5 7d639191d91cd31b87363ed5383b636bed17f757 jdk8u71-b02 1.6 12b4dcdd76c9b84fed7f6236964075846cb8964e jdk8u71-b03 1.7 +79f7e6560ce99eff5745da2a90e75200ca5b4c1e jdk8u71-b04 1.8 +15e05a6c32585edd6d2551445735994cb44f948e jdk8u71-b05 1.9 +b567f800daaadd47bbf49f69f683b515baeb4d9b jdk8u71-b06 1.10 +3cbfc8bd4b1c83e151ba786778e04e8502ea13e4 jdk8u72-b00 1.11 +121e784f01d1b658866e499a42288b2f98eeb482 jdk8u72-b01 1.12 +c51556c23de38d5f4412622853e643bb8c67d647 jdk8u72-b02 1.13 +dddcabf97b4ab156545b3e98d67d6d3e37c8529e jdk8u72-b03 1.14 +baa0e7874269223b1726c9b2eccf628d0f72bcfe jdk8u72-b04 1.15 +b2b41f383c882ee7a8c2a54dfb0957aa2764d1f8 jdk8u72-b05 1.16 +fb0c51afcc55180608f07eb6697d517416ae15da jdk8u72-b06 1.17 7d7b3488f44e77bedbbcbdee5a4415e5a5bd930c jdk8u75-b00
2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Fri Oct 16 12:16:38 2015 -0700 2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Thu Oct 29 17:08:14 2015 -0700 2.3 @@ -30,6 +30,7 @@ 2.4 import com.sun.xml.internal.bind.util.Which; 2.5 2.6 import javax.lang.model.SourceVersion; 2.7 +import javax.tools.Diagnostic; 2.8 import javax.tools.DiagnosticCollector; 2.9 import javax.tools.JavaCompiler; 2.10 import javax.tools.JavaFileObject; 2.11 @@ -239,7 +240,12 @@ 2.12 if (episode != null) 2.13 r.setEpisodeFile(episode); 2.14 task.setProcessors(Collections.singleton(r)); 2.15 - return task.call(); 2.16 + boolean res = task.call(); 2.17 + //Print messages generated by compiler 2.18 + for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) { 2.19 + System.err.println(d.toString()); 2.20 + } 2.21 + return res; 2.22 } 2.23 } 2.24