Merge jdk8u72-b05

Thu, 22 Oct 2015 22:48:01 +0100

author
robm
date
Thu, 22 Oct 2015 22:48:01 +0100
changeset 1012
b2b41f383c88
parent 1010
75e1d3d7cf91
parent 1011
70d4d5435eb4
child 1013
6aba0f814a15

Merge

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Wed Oct 21 11:35:18 2015 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java	Thu Oct 22 22:48:01 2015 +0100
     1.3 @@ -30,6 +30,7 @@
     1.4  import com.sun.xml.internal.bind.util.Which;
     1.5  
     1.6  import javax.lang.model.SourceVersion;
     1.7 +import javax.tools.Diagnostic;
     1.8  import javax.tools.DiagnosticCollector;
     1.9  import javax.tools.JavaCompiler;
    1.10  import javax.tools.JavaFileObject;
    1.11 @@ -239,7 +240,12 @@
    1.12              if (episode != null)
    1.13                  r.setEpisodeFile(episode);
    1.14              task.setProcessors(Collections.singleton(r));
    1.15 -            return task.call();
    1.16 +            boolean res = task.call();
    1.17 +            //Print messages generated by compiler
    1.18 +            for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) {
    1.19 +                 System.err.println(d.toString());
    1.20 +            }
    1.21 +            return res;
    1.22          }
    1.23      }
    1.24  

mercurial