/hg/icedtea8-forest/jaxws: 22 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Nov 2 06:19:26 UTC 2017
changeset f58a19240012 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=f58a19240012
author: asaha
date: Fri Jul 21 20:32:41 2017 -0700
Added tag jdk8u144-b01 for changeset d2226ba553ca
changeset 32a01bf45f0f in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=32a01bf45f0f
author: asaha
date: Tue Dec 13 12:52:09 2016 -0800
Added tag jdk8u151-b00 for changeset eb09a34966f4
changeset f7e7fd169aa4 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=f7e7fd169aa4
author: asaha
date: Thu Jun 08 13:44:31 2017 -0700
Merge
changeset c59814f445e8 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=c59814f445e8
author: asaha
date: Tue Jun 13 10:32:43 2017 -0700
Merge
changeset d3dec37780f8 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=d3dec37780f8
author: asaha
date: Tue Jun 13 16:29:35 2017 -0700
Added tag jdk8u151-b01 for changeset c59814f445e8
changeset ac9019089b0d in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=ac9019089b0d
author: asaha
date: Mon Jun 19 14:50:40 2017 -0700
Added tag jdk8u151-b02 for changeset d3dec37780f8
changeset 4c06ef2757de in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=4c06ef2757de
author: asaha
date: Mon Jun 26 14:56:09 2017 -0700
Merge
changeset 04a80aaab394 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=04a80aaab394
author: asaha
date: Mon Jul 03 12:23:24 2017 -0700
Added tag jdk8u151-b03 for changeset 4c06ef2757de
changeset eb94199102ea in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=eb94199102ea
author: asaha
date: Mon Jul 10 15:30:12 2017 -0700
Added tag jdk8u151-b04 for changeset 04a80aaab394
changeset 6089203bd3f3 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=6089203bd3f3
author: asaha
date: Fri Jul 14 10:45:53 2017 -0700
Merge
changeset 730acb5d508e in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=730acb5d508e
author: aefimov
date: Tue Jul 11 14:09:46 2017 +0100
8181100: Better Base Exceptions
Summary: Also reviewed by Roman Grigoriadi <roman.grigoriadi at oracle.com>
Reviewed-by: dfuchs
changeset 7ce2bd0eda1f in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=7ce2bd0eda1f
author: asaha
date: Mon Jul 17 13:42:07 2017 -0700
Added tag jdk8u151-b05 for changeset 730acb5d508e
changeset 2abea38c7cce in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=2abea38c7cce
author: asaha
date: Sun Jul 23 23:21:00 2017 -0700
Merge
changeset 4324e571f7fd in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=4324e571f7fd
author: asaha
date: Tue Jul 25 12:18:49 2017 -0700
Added tag jdk8u151-b06 for changeset 2abea38c7cce
changeset 1c0acbb50d51 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=1c0acbb50d51
author: asaha
date: Tue Aug 01 12:00:34 2017 -0700
Added tag jdk8u151-b07 for changeset 4324e571f7fd
changeset 4d80be6e653e in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=4d80be6e653e
author: asaha
date: Tue Aug 08 09:42:53 2017 -0700
Added tag jdk8u151-b08 for changeset 1c0acbb50d51
changeset 373e5d67f1f3 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=373e5d67f1f3
author: coffeys
date: Tue Aug 08 12:02:05 2017 +0100
8184682: Upgrade compression library
Reviewed-by: alanb, sherman, ahgross, jeff
changeset f910c0bf9da8 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=f910c0bf9da8
author: asaha
date: Tue Aug 15 13:19:53 2017 -0700
Added tag jdk8u151-b09 for changeset 373e5d67f1f3
changeset 3d15802f4ed8 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=3d15802f4ed8
author: asaha
date: Wed Aug 23 13:02:56 2017 -0700
Added tag jdk8u151-b10 for changeset f910c0bf9da8
changeset cce697096465 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=cce697096465
author: asaha
date: Tue Aug 29 10:30:54 2017 -0700
Added tag jdk8u151-b11 for changeset 3d15802f4ed8
changeset eafb356c44d0 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=eafb356c44d0
author: andrew
date: Mon Oct 30 17:28:37 2017 +0000
Merge jdk8u151-b12
changeset 77e08d2f7079 in /hg/icedtea8-forest/jaxws
details: http://icedtea.classpath.org/hg/icedtea8-forest/jaxws?cmd=changeset;node=77e08d2f7079
author: andrew
date: Thu Nov 02 06:16:08 2017 +0000
Added tag icedtea-3.6.0 for changeset eafb356c44d0
diffstat:
.hgtags | 49 ++++++++++
.jcheck/conf | 2 -
THIRD_PARTY_README | 4 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 +
src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java | 47 ++++++---
src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java | 16 ++-
6 files changed, 102 insertions(+), 24 deletions(-)
diffs (319 lines):
diff -r d2226ba553ca -r 77e08d2f7079 .hgtags
--- a/.hgtags Thu Jul 20 23:11:18 2017 -0700
+++ b/.hgtags Thu Nov 02 06:16:08 2017 +0000
@@ -50,6 +50,7 @@
558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73
f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74
fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
+0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12
765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76
5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
@@ -63,6 +64,7 @@
512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87
8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88
+1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13
bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89
ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90
cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91
@@ -111,6 +113,7 @@
545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134
d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135
c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136
+339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14
ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137
cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
@@ -295,6 +298,7 @@
a61ba2e3e6c85f7067fb7b0c3c02584abdfa96be jdk8u20-b07
bc6d2f3426f3d04adc8245ad120e2b52fe7dfbde jdk8u20-b08
2e76ce4ec993c32368ef51b67873aa5ff06e1437 jdk8u20-b09
+806fa0e68d922e3a5ff7c34317bf9f33dbc97eab icedtea-3.0.0pre01
84f913145e2acb8474f3779d7ef154eebec9537a jdk8u20-b10
ce4e5885a11012edaf76ce9a6115e23acabfd282 jdk8u20-b11
94fbd96ebb83a3ce966c347082b079f9e4fec76a jdk8u20-b12
@@ -308,6 +312,7 @@
4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
31d43d250c836c13fcc87025837783788c5cd0de jdk8u20-b21
2d360fb1b2b89c90133231f9ed5f823997b70c19 jdk8u20-b22
+9be5317def515b75e48704afdfc0d81d6b9783f4 icedtea-3.0.0pre02
f3bf1b270fea8b17aa2846f962f7514b6f772ab4 jdk8u20-b23
1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b24
1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b25
@@ -375,6 +380,9 @@
fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18
c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u40-b19
a21c4edfdf4402f027183ac8c8aac2db49df3b7d jdk8u40-b20
+7ba7b06f15cf159affd6883e0577c10e9c857a29 icedtea-3.0.0pre03
+db7fdb068af965a0524d0f30056e3e3bbccb3899 icedtea-3.0.0pre04
+561f103796e5b19207e2b6cf3275f047da284a62 icedtea-3.0.0pre05
16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
@@ -453,6 +461,9 @@
a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
+1c0bd390de6663c03939525779c2b0400994dde3 icedtea-3.0.0pre06
+2012603e0e903fcefe85a17ece0ce5ea0ce5df28 icedtea-3.0.0pre07
+26a1fdce80b734da2d105182f51430f0d015bef0 icedtea-3.0.0pre08
1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24
0497fdafbc8d19d72bce668e65dc5e5457f6f21a jdk8u60-b25
a20f5fa8d56298239e762408d3a427a0632a8b69 jdk8u60-b26
@@ -531,6 +542,7 @@
a2473dd1dc0df47425e42d7fed1e4cabdb696154 jdk8u72-b12
4c28352ce19bc25be5de681868a8cddb3f3644a8 jdk8u72-b13
1a523f4b8cc77ef9dfb6d8191742dcd616cd9093 jdk8u72-b14
+2ceaeebc67608f6b4f930a0d93ca6cb8386397eb icedtea-3.0.0pre09
2f840ac0adf079f0d2f0bac7a9c3fae6ea651271 jdk8u72-b15
744fab401c4b326f142f5110ad523b1b22f973c8 jdk8u72-b31
8da626c14c138dd41d4c685800351bf675048628 jdk8u73-b00
@@ -563,6 +575,9 @@
a2f8a45d70b21e450fac7ae7d5ca71ce853cf3d0 jdk8u77-b00
dd34713088c23b7c6ef1adc071dd635bc7bda744 jdk8u77-b01
7c319d6e0d4c59ebde91b88ba1391ace165b2f01 jdk8u77-b02
+ee1046345cb002b4ade524965a2e703a095068a3 icedtea-3.0.0pre10
+a81c04154cc5752f1344be27b797681bc4264885 icedtea-3.0.0
+919fa205539a3c06f1ab6f4f17ec0b49110fb4cd icedtea-3.0-branchpoint
c6f67bea4466783433b1bf1f83a4eb6784a5eb55 jdk8u77-b03
f66ee2329cd21c3485de1b8e0588f55882a56e0d jdk8u91-b00
be5935ee38f1bc5132cf318f7badb61af86e2396 jdk8u91-b13
@@ -583,6 +598,10 @@
fad3981b329a0d309f4922bbca7335973e32e50f jdk8u76-b12
451d700ba30ee0d3d201090a9d5dd606b988820e jdk8u92-b00
008547c7dd3e324c46c2711b54285ca99e2ae0b9 jdk8u92-b13
+74ff0e6139bf0973a183279d32ac5303cb1d38fb icedtea-3.1.0pre01
+4946f14d652f279394a85745709801c75d31bd0e icedtea-3.1.0pre02
+82ec7b3637db469316d659fe6ea4aa02a3e467ab icedtea-3.1.0pre03
+9812eb7e305e064e8efe831fad1e9481b9e91009 icedtea-3.1.0pre04
759ba92444a9e85434cb381f437aba65e3c9f780 jdk8u92-b14
38c6262b86559ff589f65f5bcc744b1763e20311 jdk8u92-b31
b762186ac713fbb0fc759110a1c88bca4b4818cd jdk8u92-b32
@@ -601,6 +620,8 @@
ea422e4481f6edfb77bb3a4cd74a73e463143ff3 jdk8u101-b10
5f3dcb815b9715215d086ba0d48a59b23d01d0a4 jdk8u101-b11
6a0347504d4c4171fcc24bc17749c0559518d862 jdk8u101-b12
+534ca1b701d1e58af14577fc8b466023f44b4bdf icedtea-3.1.0
+cfba1219c991d38b5c31e5034a2aa855f8038887 icedtea-3.2.0pre01
287f9e9d45cc05b902925346bb6f6ee34a5d5813 jdk8u101-b13
6aba0f814a15966e47aeab61b466894b82c03c70 jdk8u76-b00
60789eebd1fe440255fd3f504221dc8b5553b8c2 jdk8u76-b01
@@ -622,6 +643,8 @@
0305736a8580ad84733878623eda8f770ae04d60 jdk8u102-b11
d02665ceefe5b12539bcd2bde95d4ada1a135cb0 jdk8u102-b12
d84434eb3e4e991812a7b0c3c9e6bfdabae910d0 jdk8u102-b13
+e681ae17749480117cc407654ace09d6c0112932 icedtea-3.2.0pre02
+20d379a7883648ad90af8bf79e4d23ce58fcf94c icedtea-3.2.0pre03
81f2d81a48d74d2d4882c11330366517b73ee064 jdk8u102-b14
de23881ca76c9c69f4e47e9b15d09a91fbb17176 jdk8u102-b31
f638db3f652d3ec698aad0193c118c8afdaa001b jdk8u102-b32
@@ -642,6 +665,7 @@
730d8fc6bbfc5c642770b15e4787e1d0545c8f32 jdk8u111-b11
6ccfdf9a9af5f2df5cbd5ecd5f17aecef289094b jdk8u111-b12
914f31660407050cb04357f472d8365d5a781cd7 jdk8u111-b13
+f57f3ddddff63b25bbe59d93213a379a9663c085 icedtea-3.2.0
1439cb8c6e86560934b9642cf36cddbfcb8f87be jdk8u111-b14
2d1c73175b3a5bd829503734e6eb65426bd12e16 jdk8u112-b00
10388356386d4c6eaf63dc50a05b5a373b4dde98 jdk8u112-b01
@@ -659,6 +683,7 @@
14fa3ed278a279dc85c150bf54b2ec4fa29cf347 jdk8u112-b14
5f84e87f91d5bc36ed026b88d183821e5109d730 jdk8u112-b15
d82dd7a24a496e26987caa328d1fb4fc794a4770 jdk8u112-b16
+b97cf465bf9f4b4b9f7c19fabeaa7e54f248451f icedtea-3.3.0pre01
021da5d50285a523d4622a727ea1a7019f2b52e4 jdk8u112-b31
452662a83e5bc6dc7e9425ddd10f6c8fc98d50d8 jdk8u121-b00
9cd16be39ca6f2c8f7cc99ad07a77bb9d0696c75 jdk8u121-b01
@@ -673,6 +698,9 @@
c317f0eacd602a8765d25b0fcd382f76af3697a5 jdk8u121-b10
89aa912be940d6c30f59b80c826f212541912a56 jdk8u121-b11
52b3f9fb54ee4304a9c34a2fe07f0c9a49472185 jdk8u121-b12
+7912f05c2a6d8fdbf55534c921f06e81dbaf8d8d icedtea-3.3.0pre02
+5f5237104669ce0a726ffc6769fa29a55b0174a8 icedtea-3.3.0
+30f2a833a54f3c2e8791890ad88a84a581c620d9 icedtea-3.4.0pre01
5b8834cc3bb9e24153319c766e04e194945a61b9 jdk8u121-b13
2359a73f36ca99ba30aef88a38936f6f4e18e65c jdk8u131-b00
bc5500cde753aed78c92e7301548fa1450c9b104 jdk8u131-b01
@@ -685,6 +713,8 @@
4e86f5b1caaf3083befd44c7369885eacdd3fe95 jdk8u131-b08
548546d23a924ff0962df885468ce49816ae48a9 jdk8u131-b09
bc74b4850d97ff1986bf551c752ce212f97f4b0e jdk8u131-b10
+c1bfc2395c57e2ceae8658883356f437ec5ed7c5 icedtea-3.4.0
+18b3704bc51d5b4f7d31faf8e8aebb2f6c69b014 icedtea-3.5.0pre01
7817f0d2519573e42405ef96a7c7ff1d768f92ec jdk8u131-b11
74aa403ef03d56469e9364cc45c2ec18c6e50e33 jdk8u141-b00
b1138396b99b1f8ebdb7d28c7143c96eb5b4f991 jdk8u141-b01
@@ -701,5 +731,24 @@
d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12
27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13
65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14
+8c2ac8bef689763d71725e55cef58666b890690b icedtea-3.5.0
c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
c57e086660a37470793e38b94d7abedb79489ce3 jdk8u144-b00
+4fb91927293516e83de8047c99a71aceeea452e9 icedtea-3.5.1
+8c2ac8bef689763d71725e55cef58666b890690b icedtea-3.6.0pre00
+4fb91927293516e83de8047c99a71aceeea452e9 icedtea-3.6.0pre01
+768279d73ebb3a96825e365eb6999abaa991c64a icedtea-3.6.0pre02
+d2226ba553ca545f9bf9ffa66254478faca378a2 jdk8u144-b01
+eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
+c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
+d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
+4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03
+04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04
+730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05
+2abea38c7ccedf1eabe9245ca9619cd006484a07 jdk8u151-b06
+4324e571f7fddf12b24fa8b9c4670ff1a3443b87 jdk8u151-b07
+1c0acbb50d5171b56c95b3abb2a92aee864beb35 jdk8u151-b08
+373e5d67f1f374a10d39e95963569db3949539e6 jdk8u151-b09
+f910c0bf9da82c7b1f10903f2e76eeee0a2e20be jdk8u151-b10
+3d15802f4ed80eb489bf0b25bff552bcf831276e jdk8u151-b11
+eafb356c44d000be9dba0c8d546b569605d0ccfe icedtea-3.6.0
diff -r d2226ba553ca -r 77e08d2f7079 .jcheck/conf
--- a/.jcheck/conf Thu Jul 20 23:11:18 2017 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r d2226ba553ca -r 77e08d2f7079 THIRD_PARTY_README
--- a/THIRD_PARTY_README Thu Jul 20 23:11:18 2017 -0700
+++ b/THIRD_PARTY_README Thu Nov 02 06:16:08 2017 +0000
@@ -2808,12 +2808,12 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to zlib v1.2.8, which may be included
+%% This notice is provided with respect to zlib v1.2.11, which may be included
with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
- version 1.2.8, April 28th, 2013
+ version 1.2.11, January 15th, 2017
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
diff -r d2226ba553ca -r 77e08d2f7079 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Jul 20 23:11:18 2017 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Nov 02 06:16:08 2017 +0000
@@ -71,6 +71,14 @@
SchemaFactory sf = XmlFactory.createSchemaFactory(W3C_XML_SCHEMA_NS_URI, disableXmlSecurity);
XmlFactory.allowExternalAccess(sf, "all", disableXmlSecurity);
sf.setErrorHandler(errorFilter);
+ try {
+ // By default the SchemaFactory imposes a limit of 5000 on
+ // xsd:sequence maxOccurs if a SecurityManager is
+ // installed. This breaks the specification of xjc,
+ // causing TCK failures.
+ sf.setProperty("http://apache.org/xml/properties/security-manager", null);
+ } catch (SAXException e) {
+ }
if( entityResolver != null ) {
sf.setResourceResolver(new LSResourceResolver() {
public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
diff -r d2226ba553ca -r 77e08d2f7079 src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java Thu Jul 20 23:11:18 2017 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java Thu Nov 02 06:16:08 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -81,24 +81,37 @@
synchronized(servers) {
state = servers.get(inetAddress);
if (state == null) {
- logger.fine("Creating new HTTP Server at "+inetAddress);
- // Creates server with default socket backlog
- server = HttpServer.create(inetAddress, 0);
- server.setExecutor(Executors.newCachedThreadPool());
- String path = url.toURI().getPath();
- logger.fine("Creating HTTP Context at = "+path);
- HttpContext context = server.createContext(path);
- server.start();
+ final int finalPortNum = port;
+ for (ServerState s: servers.values()) {
+ if (s.getServer()
+ .getAddress()
+ .getPort() == finalPortNum) {
+ state = s;
+ break;
+ }
+ }
- // we have to get actual inetAddress from server, which can differ from the original in some cases.
- // e.g. A port number of zero will let the system pick up an ephemeral port in a bind operation,
- // or IP: 0.0.0.0 - which is used to monitor network traffic from any valid IP address
- inetAddress = server.getAddress();
+ if (!inetAddress.getAddress().isAnyLocalAddress() ||
+ state == null) {
+ logger.fine("Creating new HTTP Server at "+inetAddress);
+ // Creates server with default socket backlog
+ server = HttpServer.create(inetAddress, 0);
+ server.setExecutor(Executors.newCachedThreadPool());
+ String path = url.toURI().getPath();
+ logger.fine("Creating HTTP Context at = "+path);
+ HttpContext context = server.createContext(path);
+ server.start();
- logger.fine("HTTP server started = "+inetAddress);
- state = new ServerState(server, path);
- servers.put(inetAddress, state);
- return context;
+ // we have to get actual inetAddress from server, which can differ from the original in some cases.
+ // e.g. A port number of zero will let the system pick up an ephemeral port in a bind operation,
+ // or IP: 0.0.0.0 - which is used to monitor network traffic from any valid IP address
+ inetAddress = server.getAddress();
+
+ logger.fine("HTTP server started = "+inetAddress);
+ state = new ServerState(server, path);
+ servers.put(inetAddress, state);
+ return context;
+ }
}
}
server = state.getServer();
diff -r d2226ba553ca -r 77e08d2f7079 src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Thu Jul 20 23:11:18 2017 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java Thu Nov 02 06:16:08 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.ws.WebServiceException;
/**
@@ -117,13 +119,21 @@
String resourceBundleName = (String) in.readObject();
String key = (String) in.readObject();
int len = in.readInt();
- if (len == -1) {
+ if (len < -1) {
+ throw new NegativeArraySizeException();
+ } else if (len == -1) {
args = null;
- } else {
+ } else if (len < 255) {
args = new Object[len];
for (int i = 0; i < args.length; i++) {
args[i] = in.readObject();
}
+ } else {
+ List<Object> argList = new ArrayList<>(Math.min(len, 1024));
+ for (int i = 0; i < len; i++) {
+ argList.add(in.readObject());
+ }
+ args = argList.toArray(new Object[argList.size()]);
}
msg = new LocalizableMessageFactory(resourceBundleName).getMessage(key,args);
}
More information about the distro-pkg-dev
mailing list