# HG changeset patch # User andrew # Date 1454694083 0 # Node ID 2ceaeebc67608f6b4f930a0d93ca6cb8386397eb # Parent 1f1e5105e2fa8d0a803c3b4b514f49235475de5b# Parent 2f840ac0adf079f0d2f0bac7a9c3fae6ea651271 Merge jdk8u72-b15 diff -r 1f1e5105e2fa -r 2ceaeebc6760 .hgtags --- a/.hgtags Fri Feb 05 03:38:12 2016 +0000 +++ b/.hgtags Fri Feb 05 17:41:23 2016 +0000 @@ -358,6 +358,7 @@ 49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31 9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32 ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33 +e7a9c2fb6b0529e4c64a33240fd18c3e4864dc52 jdk8u31-b34 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01 8043f77ef8a4ded9505269a356c4e2f4f9604cd9 jdk8u40-b02 @@ -409,6 +410,11 @@ cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15 8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31 1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32 +67e3db8ade754c88f735ce23d7e6aaaeff075e71 jdk8u45-b33 +7fbeef307a54dd209687e22e7244012f512805bc jdk8u45-b34 +f2afa963f0ce5804dafc8d9c4bc951b08acdf04c jdk8u45-b35 +f5af8bb98711743ae10c61abc3f163ac44e70971 jdk8u45-b36 +32680a5ae597b05911770a9863643d4639498fea jdk8u45-b37 74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00 78d8cafb17e46dd2453704f679ca1e431e4df0ba jdk8u51-b01 9bd6f57d97e5423d5f25774b095124cbe1eeb9c1 jdk8u51-b02 @@ -426,6 +432,9 @@ 4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14 dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15 e465c106bfe3feb6e2887fa512511c894c092dde jdk8u51-b16 +b189fe14d0f4375961a60d3e8532ca652e1aa592 jdk8u51-b31 +ef7893ef8718d205494fd5f79921be7c63b598b0 jdk8u51-b32 +e8631058a15d828af4d362cc247b18fc71aefeee jdk8u51-b33 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00 7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01 5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02 @@ -453,3 +462,76 @@ 1c0bd390de6663c03939525779c2b0400994dde3 icedtea-3.0.0pre06 2012603e0e903fcefe85a17ece0ce5ea0ce5df28 icedtea-3.0.0pre07 26a1fdce80b734da2d105182f51430f0d015bef0 icedtea-3.0.0pre08 +1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24 +0497fdafbc8d19d72bce668e65dc5e5457f6f21a jdk8u60-b25 +a20f5fa8d56298239e762408d3a427a0632a8b69 jdk8u60-b26 +975eb04d17953228e0f401cfee657fa9f5e26915 jdk8u60-b27 +2ba41569e6a0d314333fc3d4375381fdde4de7ea jdk8u60-b31 +61c97f549df419ef128d56d830014c8c782f220e jdk8u60-b32 +b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06 +45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07 +b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00 +2af4e64ba020ba1419f48ed901ba0c91ea6b0aa1 jdk8u65-b01 +0851a86980a752b2b0250f7aa8da0e95cd07520c jdk8u65-b02 +330a44775442aba19645e9de00f6e09e398493ac jdk8u65-b03 +8c449f659e1338f7360295659201e0f1f204b711 jdk8u65-b04 +34221564cc133b306fa2cbadea0524ccb6c11e78 jdk8u65-b05 +14a55d61e06e2c20cd108ff636d1b853f5c8749a jdk8u65-b06 +20c5aa28a5fdc1c2c57e9561b08efb1a054fea22 jdk8u65-b07 +7f5df082d224e558e546cfddaf0805d68f34b2e5 jdk8u65-b08 +fd04b18dbdd1cb6fd7a63f2719f74f9bd7f8131d jdk8u65-b09 +6adf33f124fdd40b0079013c1074b4c7fc24aae7 jdk8u65-b10 +0a351d11449f81065425154c679a255c7916cc6d jdk8u65-b11 +414bc42938220882d399efd347f249cdfa024a6a jdk8u65-b12 +0984b16cc4d5b787fe03a2c1385a02030e9178fc jdk8u65-b13 +55033df0bbba6593bca22a4552bffc014fc6fbf2 jdk8u65-b14 +4ccc9e1468ae438821c5774cfd92129c1cc7bc6e jdk8u65-b15 +8ad14ed35d90f80d747a807307aaf92b146f53a9 jdk8u65-b16 +dbdfb913c5284242da2f97c74d031f24719edf56 jdk8u65-b17 +6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u66-b00 +9655502cb94fada4580aa1d8ac08ed027b2272ed jdk8u66-b01 +0357274e67e94963c226f98e3af535ada2c7e0c5 jdk8u66-b02 +c3801338e94e391e639602106f5a76c725f2bc6c jdk8u66-b07 +1f936b23f61914dc75c8b496ad6b13c453af81be jdk8u66-b08 +e294a428c36f3d405fb691bfa07905e76637412c jdk8u66-b09 +b30c137b45929ec5f300fa831eab49807f0fea0a jdk8u66-b10 +b4bf5b2e93a0ec26dfc70caebaeace3927243b19 jdk8u66-b11 +8ab75dba8353e1dd658e086de9c7ad1157d81cd7 jdk8u66-b12 +d0c6921ee6c88e050673cb9cf9f88b7159442c1c jdk8u66-b13 +972d89655bab60525ddbc9365354fc809d0b74ea jdk8u66-b14 +19e64af41036d4ba0109ac2838133de5e7d159cc jdk8u66-b15 +529e4f09082daa07610ddde7dd2bca35b979eb14 jdk8u66-b16 +78c988a427d751f5a986af258248b3665950e509 jdk8u66-b17 +f3e9f0fcf5560c535bb93735b4c54e2f0257eb1a jdk8u66-b18 +f3c71687f52b6c4c331af8f6d200f677b367995c jdk8u66-b31 +47fc8ab84f47979b378158626f84b99b6f2b110f jdk8u71-b00 +f86ce5ee62ba5d0c91040fa53f0de5b19b20f155 jdk8u71-b01 +7d639191d91cd31b87363ed5383b636bed17f757 jdk8u71-b02 +12b4dcdd76c9b84fed7f6236964075846cb8964e jdk8u71-b03 +79f7e6560ce99eff5745da2a90e75200ca5b4c1e jdk8u71-b04 +15e05a6c32585edd6d2551445735994cb44f948e jdk8u71-b05 +b567f800daaadd47bbf49f69f683b515baeb4d9b jdk8u71-b06 +58f12bf42e5d726b01429a5bbfe26955c6620051 jdk8u71-b07 +7099cbc92fa4f4555e9ad8e19773851d701968b2 jdk8u71-b08 +a46eae10609ff4c9199fec9bff277f892da00495 jdk8u71-b09 +8ba92a4a3607da20a57f35d671e5ead5c5a5de3b jdk8u71-b10 +bd83bb17b08125088de07773d0305671d966ed6e jdk8u71-b11 +cf00d4a52f6444c8128313be33c29a98f67734bd jdk8u71-b12 +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 diff -r 1f1e5105e2fa -r 2ceaeebc6760 src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Fri Feb 05 03:38:12 2016 +0000 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java Fri Feb 05 17:41:23 2016 +0000 @@ -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 d : diagnostics.getDiagnostics()) { + System.err.println(d.toString()); + } + return res; } }