changeset 1145:6cfef18571fd jdk8u74-b02

Merge
author asaha
date Fri, 29 Jan 2016 14:02:29 -0800
parents 0f7882b83693 (diff) 4565249aa227 (current diff)
children a2f8a45d70b2
files .hgtags
diffstat 2 files changed, 25 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jan 29 13:42:47 2016 -0800
+++ b/.hgtags	Fri Jan 29 14:02:29 2016 -0800
@@ -509,6 +509,24 @@
 b570e47d708e4d7e9d65371ca16c3c93b0362091 jdk8u71-b13
 13b47358cf8965869865382d74c079c9290787f7 jdk8u71-b14
 6fabdb0ad3a0b28c7c1f9da4e7756c90f2c92b47 jdk8u71-b15
+3cbfc8bd4b1c83e151ba786778e04e8502ea13e4 jdk8u72-b00
+121e784f01d1b658866e499a42288b2f98eeb482 jdk8u72-b01
+c51556c23de38d5f4412622853e643bb8c67d647 jdk8u72-b02
+dddcabf97b4ab156545b3e98d67d6d3e37c8529e jdk8u72-b03
+baa0e7874269223b1726c9b2eccf628d0f72bcfe jdk8u72-b04
+b2b41f383c882ee7a8c2a54dfb0957aa2764d1f8 jdk8u72-b05
+fb0c51afcc55180608f07eb6697d517416ae15da jdk8u72-b06
+abf379db9ce09f747535558fa81d8468b220b810 jdk8u72-b07
+9c9e8cacf2b9161b2cbe232c6aa083fa09a5e63a jdk8u72-b08
+281229749d8ec6fbcd5e7a1eb05b433cd03d7b22 jdk8u72-b09
+b7a0a2c501f43027b870940b3fce2fe1306fc597 jdk8u72-b10
+96671bae6d531d23d1d6c9e1eff09e609dd3a273 jdk8u72-b11
+a2473dd1dc0df47425e42d7fed1e4cabdb696154 jdk8u72-b12
+4c28352ce19bc25be5de681868a8cddb3f3644a8 jdk8u72-b13
+1a523f4b8cc77ef9dfb6d8191742dcd616cd9093 jdk8u72-b14
+2f840ac0adf079f0d2f0bac7a9c3fae6ea651271 jdk8u72-b15
 8da626c14c138dd41d4c685800351bf675048628 jdk8u73-b00
 dfc9feacece48fa8450b997e463afae2c1539ac3 jdk8u73-b01
 06fb882f8ed7ff3e58f7aa57e526e55c25ae9992 jdk8u73-b02
+4a5f76111c0b056357d4bdd3e015d649de2db591 jdk8u74-b00
+621e4ac137cd4a04ac1279e75d7fd0625765fd03 jdk8u74-b01
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Fri Jan 29 13:42:47 2016 -0800
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Fri Jan 29 14:02:29 2016 -0800
@@ -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;
         }
     }