/hg/icedtea8-forest/corba: 36 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Aug 8 14:54:03 UTC 2016
changeset 3787d7359ef6 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=3787d7359ef6
author: asaha
date: Mon Jan 25 15:46:31 2016 -0800
Added tag jdk8u82-b00 for changeset 223d0e48a55b
changeset 961d6ccd9bd1 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=961d6ccd9bd1
author: asaha
date: Mon Feb 01 16:27:27 2016 -0800
Merge
changeset 803798e13dd5 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=803798e13dd5
author: msheppar
date: Tue Feb 16 12:37:44 2016 +0000
8144144: ORB destroy() leaks filedescriptors after unsuccessful connection
Reviewed-by: chegar, coffeys
changeset ff1de567fa6b in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=ff1de567fa6b
author: asaha
date: Wed Mar 23 12:20:02 2016 -0700
Added tag jdk8u102-b00 for changeset 223d0e48a55b
changeset 1bb52ca92240 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=1bb52ca92240
author: asaha
date: Wed Mar 23 14:54:57 2016 -0700
Merge
changeset 6f09f3dfcba3 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=6f09f3dfcba3
author: asaha
date: Tue Mar 22 11:53:10 2016 -0700
Merge
changeset 9d09a2f13955 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=9d09a2f13955
author: asaha
date: Wed Mar 23 15:16:18 2016 -0700
Merge
changeset 564fbe28cbb0 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=564fbe28cbb0
author: asaha
date: Tue Mar 29 13:25:06 2016 -0700
Added tag jdk8u102-b01 for changeset 9d09a2f13955
changeset 4b169a18d409 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=4b169a18d409
author: asaha
date: Mon Apr 11 13:47:26 2016 -0700
Added tag jdk8u102-b02 for changeset 564fbe28cbb0
changeset 3c4fd101d6e6 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=3c4fd101d6e6
author: asaha
date: Tue Apr 05 08:48:32 2016 -0700
Merge
changeset ab7dbd58a766 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=ab7dbd58a766
author: asaha
date: Mon Apr 11 14:54:45 2016 -0700
Merge
changeset 626d8fa7a1bf in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=626d8fa7a1bf
author: asaha
date: Mon Apr 18 15:27:45 2016 -0700
Added tag jdk8u102-b03 for changeset ab7dbd58a766
changeset b87d82f5c33d in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=b87d82f5c33d
author: asaha
date: Mon Apr 25 09:31:39 2016 -0700
Added tag jdk8u102-b04 for changeset 626d8fa7a1bf
changeset 3c35b66b5345 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=3c35b66b5345
author: asaha
date: Mon Apr 25 10:59:08 2016 -0700
Merge
changeset 889731f1c4fc in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=889731f1c4fc
author: asaha
date: Wed Apr 27 15:30:58 2016 -0700
Added tag jdk8u102-b05 for changeset 3c35b66b5345
changeset 2a265ab91dd2 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=2a265ab91dd2
author: asaha
date: Mon May 02 14:46:14 2016 -0700
Merge
changeset 9dfad32be1ed in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=9dfad32be1ed
author: asaha
date: Mon May 02 15:03:22 2016 -0700
Added tag jdk8u102-b06 for changeset 2a265ab91dd2
changeset 9d62d30ed9fc in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=9d62d30ed9fc
author: aefimov
date: Thu May 05 19:09:54 2016 +0300
8152927: Incorrect GPL header in StubFactoryDynamicBase.java reported
Reviewed-by: alanb
changeset 8d44271dd11d in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=8d44271dd11d
author: asaha
date: Mon May 09 11:30:49 2016 -0700
Merge
changeset 0dcc485c5c19 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=0dcc485c5c19
author: asaha
date: Mon May 09 11:51:58 2016 -0700
Added tag jdk8u102-b07 for changeset 8d44271dd11d
changeset 329501e6cc22 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=329501e6cc22
author: asaha
date: Mon May 16 10:42:56 2016 -0700
Merge
changeset 559e261824c7 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=559e261824c7
author: asaha
date: Mon May 16 10:54:35 2016 -0700
Added tag jdk8u102-b08 for changeset 329501e6cc22
changeset 4cbea61d24af in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=4cbea61d24af
author: asaha
date: Thu May 19 03:55:09 2016 -0700
8157078: 8u102 L10n resource file updates
Summary: 8u102 L10n resource file updates
Reviewed-by: coffeys
Contributed-by: li.jiang at oracle.com
changeset e108e30edcca in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=e108e30edcca
author: asaha
date: Mon May 23 20:36:59 2016 -0700
Merge
changeset fea6827decb5 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=fea6827decb5
author: asaha
date: Mon May 23 20:53:29 2016 -0700
Added tag jdk8u102-b09 for changeset e108e30edcca
changeset e0d70741f35c in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=e0d70741f35c
author: asaha
date: Tue May 31 09:51:43 2016 -0700
Merge
changeset dfb0dac9f92e in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=dfb0dac9f92e
author: asaha
date: Tue May 31 10:29:03 2016 -0700
Added tag jdk8u102-b10 for changeset e0d70741f35c
changeset 360a2772486d in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=360a2772486d
author: asaha
date: Mon Jun 06 12:53:57 2016 -0700
Merge
changeset 44507a24a797 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=44507a24a797
author: asaha
date: Mon Jun 06 13:19:00 2016 -0700
Added tag jdk8u102-b11 for changeset 360a2772486d
changeset 57546b5b575d in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=57546b5b575d
author: asaha
date: Mon Jun 13 13:11:07 2016 -0700
Merge
changeset fc50e5f1bf46 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=fc50e5f1bf46
author: asaha
date: Mon Jun 13 13:22:22 2016 -0700
Added tag jdk8u102-b12 for changeset 57546b5b575d
changeset cd8d459147c3 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=cd8d459147c3
author: asaha
date: Tue Jun 21 18:20:02 2016 -0700
Added tag jdk8u101-b13 for changeset 2bb2aec4b3e5
changeset a7c292080d5e in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=a7c292080d5e
author: asaha
date: Tue Jun 21 18:38:56 2016 -0700
Merge
changeset 56b133772ec1 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=56b133772ec1
author: asaha
date: Tue Jun 21 18:48:47 2016 -0700
Added tag jdk8u102-b13 for changeset a7c292080d5e
changeset f85c4b0c0469 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=f85c4b0c0469
author: andrew
date: Fri Aug 05 05:27:01 2016 +0100
Merge jdk8u102-b14
changeset 459f130b3f85 in /hg/icedtea8-forest/corba
details: http://icedtea.classpath.org/hg/icedtea8-forest/corba?cmd=changeset;node=459f130b3f85
author: andrew
date: Mon Aug 08 15:51:25 2016 +0100
Added tag icedtea-3.2.0pre02 for changeset f85c4b0c0469
diffstat:
.hgtags | 148 ++++++++++
.jcheck/conf | 2 -
src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 35 +-
src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties | 12 +-
src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties | 4 +-
src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java | 2 +-
src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java | 20 +
src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java | 90 +++++-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 30 +-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 13 +-
src/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java | 2 +
src/share/classes/javax/rmi/CORBA/Util.java | 44 ++-
13 files changed, 357 insertions(+), 50 deletions(-)
diffs (truncated from 824 to 500 lines):
diff -r 223d0e48a55b -r 459f130b3f85 .hgtags
--- a/.hgtags Mon Jan 25 13:20:44 2016 -0800
+++ b/.hgtags Mon Aug 08 15:51:25 2016 +0100
@@ -50,6 +50,7 @@
b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
937144222e2219939101b0129d26a872a7956b13 jdk7-b76
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
@@ -63,6 +64,7 @@
6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
09a41111a401d327f65e453384d976a10154d9ea jdk7-b87
39e14d2da687c7e592142137517aaf689544820f jdk7-b88
+e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13
bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89
56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90
bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
@@ -111,6 +113,7 @@
918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134
e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135
48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
+b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14
a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137
78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
@@ -295,6 +298,7 @@
32b9c4f0ab3c6d33f70724b775cb9d12c004be6d jdk8u20-b07
4e4a75376185ca1a712cc9fef5a340e6927cf5e2 jdk8u20-b08
0344396d09b0e20d4a8d1bdff9f129250a60f365 jdk8u20-b09
+a96c01f523be6fadcf777118d471a9fa5751cf1c icedtea-3.0.0pre01
e930c4fa31586b0f21887f7b50fba927550f17fb jdk8u20-b10
9a6092124c7c926d380a5f3b0f899fd1427c6e69 jdk8u20-b11
673829390271e51f8bc442ffbd4726833a7b1c06 jdk8u20-b12
@@ -308,6 +312,7 @@
aca1d25d10812c86024d9dbb7ec529876cca55e8 jdk8u20-b20
7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u20-b21
7677bf14d105ca23ab045f5041ceb19ee88b86c6 jdk8u20-b22
+83ebbcc0dda5af02ee3d99756bf6c13da956a310 icedtea-3.0.0pre02
919405d7316dfcbddee5ad8dd08905916df88e04 jdk8u20-b23
34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b24
34c930eaa6b591621afde05ca2e24571c91cdc9b jdk8u20-b25
@@ -375,6 +380,9 @@
a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u40-b19
445eceffc829e205037098115c26e38e85ea5f7c jdk8u40-b20
+6c974fba96cb81fd91bf85f434531dbd122fa3a0 icedtea-3.0.0pre03
+b493e7b682c969ef1b68c56c3512317df87a1f28 icedtea-3.0.0pre04
+a5ec6d805e3864d5d754dd47bdae5d001e812a73 icedtea-3.0.0pre05
9c54cc92c0beb29179abbce272d3f5c8ba4ffd0e jdk8u40-b21
4c7421f74674ebefb8e91eba59ab2a2db8c1abd7 jdk8u40-b22
62f7faef5ed956cd481cae6216b22fdb4b6e3e46 jdk8u40-b23
@@ -384,6 +392,7 @@
bd0186cd2419129357b110fe3f13519f68b29774 jdk8u40-b27
28a1dbd4bb9ec97427790c88d21514af2f878c94 jdk8u40-b31
663a3151c688bc3f4c092bcad21cc81e29139d62 jdk8u40-b32
+5b700e0c00471ba1b7575fc6d03d6b0a0e041b50 jdk8u40-b33
5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02
@@ -427,6 +436,7 @@
5980dad8f264bb5ec3982d64a7c0af86fc5b3d16 jdk8u51-b31
eb269a395660200c33cd58acca2df20da03567ab jdk8u51-b32
b0daf4d3eb5f5de0f073ec9d264b1964b1920c67 jdk8u51-b33
+bd928a0bfc2c0f14eaa6a86e8d5937f9e94fd514 jdk8u51-b34
8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u60-b00
15ae8298b34beb30f2bd7baa7ff895af2bec13f6 jdk8u60-b01
a98524c04cbd24bbc3029b21c033abf9108e92b4 jdk8u60-b02
@@ -451,6 +461,9 @@
d68de92de3bad991546b11d77de6e9c17edf7ec2 jdk8u60-b21
3a04901d83880634ecd70c8be992189228ccd746 jdk8u60-b22
0828bb6521738ad5a7fe11f0aa3495465f002848 jdk8u60-b23
+9e44a6fa912760c513f9a59826c061fd5ca17c5e icedtea-3.0.0pre06
+7418bb690047791d64e1b4adb692ad07d8a44bad icedtea-3.0.0pre07
+ebc2780ebeb34e292b5cfb0e8da1efafa8395306 icedtea-3.0.0pre08
b0779099d006fcb2a0af493e2a2f828411bfad33 jdk8u60-b24
c665dd5d32b04c1dbc2cf21a595fe73330849c03 jdk8u60-b25
7828b9af7733eeaf2cafa8e05e68a2661dc3c7a8 jdk8u60-b26
@@ -497,6 +510,11 @@
c53412824d4ef81343418a71877172776b0980af jdk8u66-b17
efb736c1edb983bd231617a2619d68a3eee4d850 jdk8u66-b18
d555fb895611d083724442be79e5592ba676825c jdk8u66-b31
+4436283ad3bd05910df5f7d44321b5b581ae1004 jdk8u66-b32
+b0392e7c5b0712e00341e32c3c1e8f78d56e3695 jdk8u66-b33
+39be7bf168202244171cea701baf4986e423a86b jdk8u66-b34
+9dfa25a760c6d3785276f4372dd4eda586308e3b jdk8u66-b35
+1dfa7f7ec9853fac73ad1acc8fbff382f4ecc951 jdk8u66-b36
cd1b3e5a3126d0808c845d2df518095b10a98059 jdk8u71-b00
8c21767afa1a241e8312a1d4280efadfded4883d jdk8u71-b01
c775f50c022007b4f482f51dafb95224886aca8b jdk8u71-b02
@@ -528,9 +546,139 @@
3eb18c06118e0bc2fca1e1ea6c1cbddd21a27479 jdk8u72-b12
0d9849ba664dc3381d8d6d85d5e04c00fdd476b1 jdk8u72-b13
baa49bb35fc1798a5951fcfd3f9232332651d4e9 jdk8u72-b14
+834cf5ee24b36e2ab5eef16896bfd550fd698a7b icedtea-3.0.0pre09
91e3b8e2e00618f237f571fbefdfee3f4134026f jdk8u72-b15
+e3b496b6ae52f2c018e9c628c31be984bb4907e7 jdk8u73-b00
+5e484ab4b05f1398e924ab90874f7fe2ddf20731 jdk8u73-b01
+0cfcffb354bb4c76cac46f52b16a50e3b57794b9 jdk8u73-b02
+9e88cf03fe09fbf33045f43489be6f9c00e80c35 jdk8u74-b00
+0ce690c17329bde61998e5cd30b1beec9872262f jdk8u74-b01
+5eb60567655e15d7ba4c349658d707f5bde0c2b8 jdk8u74-b02
+d82cbb7a4bfe21b146f7b91ce833ac5a579c94eb jdk8u72-b31
+e3b496b6ae52f2c018e9c628c31be984bb4907e7 jdk8u73-b00
+5e484ab4b05f1398e924ab90874f7fe2ddf20731 jdk8u73-b01
+0cfcffb354bb4c76cac46f52b16a50e3b57794b9 jdk8u73-b02
+9e88cf03fe09fbf33045f43489be6f9c00e80c35 jdk8u74-b00
+0ce690c17329bde61998e5cd30b1beec9872262f jdk8u74-b01
+5eb60567655e15d7ba4c349658d707f5bde0c2b8 jdk8u74-b02
+3d00f5689b6c6e71fb1a230b7a746b61569b90ec jdk8u74-b31
+0cec2665affa36496b906c566e22ba7048ae6087 jdk8u74-b32
+7b719c1dec62535c34030cf3457abe6f478f13a0 jdk8u77-b00
+cafc1648f432eff2c392040af2db4505c3d290b6 jdk8u77-b01
+0f0077ee5e53365562ff77a01aa97d0c7374f447 jdk8u77-b02
+e8dc6eb11c761f20b44d8c4b8acb0846268872f1 jdk8u77-b03
+af6ddd4cd94c9353cc053b888de6d42d4d0faf47 jdk8u77-b31
+073b951904b3ee7c54fb79a169478fa66d925320 jdk8u75-b00
+5b48f7defe40eab668fe554df0afd87d84d60722 jdk8u75-b01
+0015f4a7f0d02a9bb79b7a0c737590f01feaabd4 jdk8u75-b02
+74b2903babf0f4138c367e3f9eea8958f5d71b94 jdk8u75-b03
+aa99436ccf826b3a2eecdaf646814e58cf514efb jdk8u75-b04
+e4dd4a6a2e67aa42d1e22246216f56a5280f83fb jdk8u75-b05
+6ca185377097c44ee1768f2f817b1b9e3b89068c jdk8u75-b06
+77880a70d92dbfc0ab1dab1aefad179c711ea852 jdk8u75-b07
+d267b16e3ecc006200ec6478904b7ea119df5b19 jdk8u75-b08
+1030aea873cdecfb6f55ab652abc67c901f61f60 jdk8u75-b09
+964fe4bba121592325cb346e3a4fa677b277d0ec jdk8u75-b10
+f7cfd44464c3c3efd6d6f29921fad4ed0de75d83 jdk8u75-b12
+7b719c1dec62535c34030cf3457abe6f478f13a0 jdk8u77-b00
+cafc1648f432eff2c392040af2db4505c3d290b6 jdk8u77-b01
+0f0077ee5e53365562ff77a01aa97d0c7374f447 jdk8u77-b02
+9972d4fac94222734bfee16a8a5475e1f2b9e149 icedtea-3.0.0pre10
+37af47894175fa7405752524b631237007778767 icedtea-3.0.0
+f7024b8ac854c4a937bf3dbe8e12b6c3ff802765 icedtea-3.0-branchpoint
+e8dc6eb11c761f20b44d8c4b8acb0846268872f1 jdk8u77-b03
+cd7cec8fd295c0462a813b5f54dc5457c2bade2d jdk8u91-b00
+4ea02753e66e348ee4639e157061bcbdef1d7ff3 jdk8u91-b13
+f8d0cfaa9900ebda679fa9df8319fb753858f283 jdk8u91-b14
+9f89788050d38ba4e19e24894eb8b3dd24c1a9d0 jdk8u91-b15
+7b719c1dec62535c34030cf3457abe6f478f13a0 jdk8u77-b00
+cafc1648f432eff2c392040af2db4505c3d290b6 jdk8u77-b01
+0f0077ee5e53365562ff77a01aa97d0c7374f447 jdk8u77-b02
+e8dc6eb11c761f20b44d8c4b8acb0846268872f1 jdk8u77-b03
7deeb4f70404e4f52306f9d0bcfc482fc5f16fb3 jdk8u76-b00
5786892e7c7d512ef9104a469ff7eafeaac12c38 jdk8u76-b01
239155e48af89968b62e695a3233d42bed1a3282 jdk8u76-b02
137e5c45fd5422ecd6c758c6b83a2f184abef91b jdk8u76-b03
7bbceb589f5ddb6eefab2b23de0003de67cfc667 jdk8u76-b04
+ca66a2dd5cfd6d4d0d05ee9861ff3cadd7166761 jdk8u76-b05
+f8453e7a3185060e5625127fe76b5cd7ae64150a jdk8u76-b06
+dd1d572083b0b11f70f03408f6bb154bbdef4272 jdk8u76-b07
+fc122918583747b114b246babc82841a827c56c7 jdk8u76-b08
+afb55372bcc787b75e24afd28b00cfaaa45bb77d jdk8u76-b09
+d2f26e6433db89354b028fb75abcc6ca266d035f jdk8u76-b10
+df2dcefb08f9e3c65a4cbea75e54600649d063d0 jdk8u76-b11
+94c775e05eb053b8440d82298927a144ed73f340 jdk8u76-b12
+e0fbd6a51e061025f2d6ad0311a587f7ce3c2b43 jdk8u92-b00
+8f0466c0dce60b1df3bc01785b01a7f09fa7b564 jdk8u92-b13
+5617f9bec354fb2c60bbb816d175f4cee7d2c56e jdk8u92-b14
+fe88377e18b0c5f3da8e6741e0d5b9bfd45d2648 jdk8u92-b31
+073b951904b3ee7c54fb79a169478fa66d925320 jdk8u75-b00
+5b48f7defe40eab668fe554df0afd87d84d60722 jdk8u75-b01
+0015f4a7f0d02a9bb79b7a0c737590f01feaabd4 jdk8u75-b02
+74b2903babf0f4138c367e3f9eea8958f5d71b94 jdk8u75-b03
+aa99436ccf826b3a2eecdaf646814e58cf514efb jdk8u101-b00
+aa99436ccf826b3a2eecdaf646814e58cf514efb jdk8u75-b04
+e4dd4a6a2e67aa42d1e22246216f56a5280f83fb jdk8u75-b05
+6ca185377097c44ee1768f2f817b1b9e3b89068c jdk8u75-b06
+77880a70d92dbfc0ab1dab1aefad179c711ea852 jdk8u75-b07
+d267b16e3ecc006200ec6478904b7ea119df5b19 jdk8u75-b08
+1030aea873cdecfb6f55ab652abc67c901f61f60 jdk8u75-b09
+964fe4bba121592325cb346e3a4fa677b277d0ec jdk8u75-b10
+f7cfd44464c3c3efd6d6f29921fad4ed0de75d83 jdk8u75-b12
+7b719c1dec62535c34030cf3457abe6f478f13a0 jdk8u77-b00
+cafc1648f432eff2c392040af2db4505c3d290b6 jdk8u77-b01
+0f0077ee5e53365562ff77a01aa97d0c7374f447 jdk8u77-b02
+e8dc6eb11c761f20b44d8c4b8acb0846268872f1 jdk8u77-b03
+cd7cec8fd295c0462a813b5f54dc5457c2bade2d jdk8u91-b00
+4ea02753e66e348ee4639e157061bcbdef1d7ff3 jdk8u91-b13
+7deeb4f70404e4f52306f9d0bcfc482fc5f16fb3 jdk8u76-b00
+5786892e7c7d512ef9104a469ff7eafeaac12c38 jdk8u76-b01
+239155e48af89968b62e695a3233d42bed1a3282 jdk8u76-b02
+137e5c45fd5422ecd6c758c6b83a2f184abef91b jdk8u76-b03
+7bbceb589f5ddb6eefab2b23de0003de67cfc667 jdk8u76-b04
+ca66a2dd5cfd6d4d0d05ee9861ff3cadd7166761 jdk8u76-b05
+f8453e7a3185060e5625127fe76b5cd7ae64150a jdk8u76-b06
+dd1d572083b0b11f70f03408f6bb154bbdef4272 jdk8u76-b07
+fc122918583747b114b246babc82841a827c56c7 jdk8u76-b08
+afb55372bcc787b75e24afd28b00cfaaa45bb77d jdk8u76-b09
+d2f26e6433db89354b028fb75abcc6ca266d035f jdk8u76-b10
+df2dcefb08f9e3c65a4cbea75e54600649d063d0 jdk8u76-b11
+94c775e05eb053b8440d82298927a144ed73f340 jdk8u76-b12
+e0fbd6a51e061025f2d6ad0311a587f7ce3c2b43 jdk8u92-b00
+8f0466c0dce60b1df3bc01785b01a7f09fa7b564 jdk8u92-b13
+aac8863560465b1374811246c23e5ca82def8ab7 icedtea-3.1.0pre01
+cb4d2e8f71f9577c846719d0a527adf1cbd516fb icedtea-3.1.0pre02
+d920107a9fd47d1d1b662638d207b51b6184a575 icedtea-3.1.0pre03
+b74e7245e40571937a080540251b547c58020f8c icedtea-3.1.0pre04
+aa99436ccf826b3a2eecdaf646814e58cf514efb jdk8u81-b00
+8674aec1be6459f33451690fb106eec314964116 jdk8u101-b01
+96a43945cb6a69989294b511ecdfc0493ea09bf1 jdk8u101-b02
+371b0c5477d8613c06fd1206deed27759f18e42e jdk8u101-b03
+52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u101-b04
+3edb6296456161d67bf33a73faf18dc57ef548de jdk8u101-b05
+37bd092c2a7a9e71c027a33757429e02e00050de jdk8u101-b06
+df3cd274d224e22e156556bc0d7b8927b72a7608 jdk8u101-b07
+b8914ce62047d20076a64fd43a6ca8f5bb470047 jdk8u101-b08
+317ccda98b74d445f6d3b241783a22cc167cedbf jdk8u101-b09
+7c90acc432738bdc1506d510daeadf9376279dfa jdk8u101-b10
+4942432b3da1afbc2c2c87bdf896b112800e537c jdk8u101-b11
+f8511bfb19c35d8d396dc53245c06cc3710657b1 jdk8u101-b12
+7ea39ff8c227ada9e3cdb1560ff27128afb16f50 icedtea-3.1.0
+48dbf4a68dc770ef17eee71a5bdfcb46a477157c icedtea-3.2.0pre01
+2bb2aec4b3e51aab96e9c25603c7c92fcbac46de jdk8u101-b13
+223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u102-b00
+223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u82-b00
+9d09a2f1395561fe71b1a83f53907ddc52e699d6 jdk8u102-b01
+564fbe28cbb0ff2e6f55623807ea816042de00ff jdk8u102-b02
+ab7dbd58a766fb01c6643f3a80c9e96ac1278a06 jdk8u102-b03
+626d8fa7a1bfd9e65b94117a526ba57b25ec3d14 jdk8u102-b04
+3c35b66b5345f615a3ff626111587c452c8c3893 jdk8u102-b05
+2a265ab91dd234348630dab92f622a616ab76a0e jdk8u102-b06
+8d44271dd11dd4bdc88ef647fd144e544791ecc4 jdk8u102-b07
+329501e6cc220884f005afc7cd330e227931fb21 jdk8u102-b08
+e108e30edcca932832e4e5edf1a15349d3be2fed jdk8u102-b09
+e0d70741f35cd16289de3fd6049834879725dae5 jdk8u102-b10
+360a2772486dd1aa818132222ea0b7fcfa5707ef jdk8u102-b11
+57546b5b575dec9ecfbb1e9a77d87c391a44ab96 jdk8u102-b12
+a7c292080d5ed76ea5e3b123c0dee4c340aa174f jdk8u102-b13
+f85c4b0c0469a20118675c7eb210d1dee05576d8 icedtea-3.2.0pre02
diff -r 223d0e48a55b -r 459f130b3f85 .jcheck/conf
--- a/.jcheck/conf Mon Jan 25 13:20:44 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java Mon Aug 08 15:51:25 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,21 +34,13 @@
import java.security.Policy;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.Collection;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Enumeration;
-import java.util.Properties;
-import java.util.IdentityHashMap;
import java.util.StringTokenizer;
import java.util.NoSuchElementException;
@@ -165,8 +157,18 @@
* Return default ValueHandler
*/
public static ValueHandler createValueHandler() {
+ ValueHandler vh;
+ try {
+ vh = AccessController.doPrivileged(new PrivilegedExceptionAction<ValueHandler>() {
+ public ValueHandler run() throws Exception {
return Util.createValueHandler();
}
+ });
+ } catch (PrivilegedActionException e) {
+ throw new InternalError(e.getMessage());
+ }
+ return vh;
+ }
/**
* Returns true if it was accurately determined that the remote ORB is
@@ -664,7 +666,16 @@
* ValueHandler.
*/
public static byte getMaxStreamFormatVersion() {
- ValueHandler vh = Util.createValueHandler();
+ ValueHandler vh;
+ try {
+ vh = AccessController.doPrivileged(new PrivilegedExceptionAction<ValueHandler>() {
+ public ValueHandler run() throws Exception {
+ return Util.createValueHandler();
+ }
+ });
+ } catch (PrivilegedActionException e) {
+ throw new InternalError(e.getMessage());
+ }
if (!(vh instanceof javax.rmi.CORBA.ValueHandlerMultiFormat))
return ORBConstants.STREAM_FORMAT_VERSION_1;
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties Mon Aug 08 15:51:25 2016 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -23,7 +23,7 @@
# questions.
#
-orbd.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -port ORBD\uAC00 \uC2DC\uC791\uB418\uC5B4\uC57C \uD558\uB294 \uD65C\uC131 \uD3EC\uD2B8\uB85C, \uAE30\uBCF8\uAC12\uC740 1049\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -defaultdb ORBD \uD30C\uC77C\uC758 \uB514\uB809\uD1A0\uB9AC\uB85C, \uAE30\uBCF8\uAC12\uC740 "./orb.db"\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -serverid ORBD\uC758 \uC11C\uBC84 ID\uB85C, \uAE30\uBCF8\uAC12\uC740 1 \uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n
+orbd.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -port ORBD\uAC00 \uC2DC\uC791\uB418\uC5B4\uC57C \uD558\uB294 \uD65C\uC131 \uD3EC\uD2B8\uB85C, \uAE30\uBCF8\uAC12\uC740 1049\uC785\uB2C8\uB2E4(\uC120\uD0DD\uC0AC\uD56D).\n -defaultdb ORBD \uD30C\uC77C\uC758 \uB514\uB809\uD1A0\uB9AC\uB85C, \uAE30\uBCF8\uAC12\uC740 "./orb.db"\uC785\uB2C8\uB2E4(\uC120\uD0DD\uC0AC\uD56D).\n -serverid ORBD\uC758 \uC11C\uBC84 ID\uB85C, \uAE30\uBCF8\uAC12\uC740 1 \uC785\uB2C8\uB2E4(\uC120\uD0DD\uC0AC\uD56D).\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n
servertool.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n
servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624. \n
@@ -62,7 +62,7 @@
servertool.list=\n\t\uBAA9\uB85D\n
servertool.list1=\uB4F1\uB85D\uB41C \uC11C\uBC84 \uBAA8\uB450 \uB098\uC5F4
-servertool.list2=\n\t\uC11C\uBC84 ID\t\uC11C\uBC84 \uD074\uB798\uC2A4 \uC774\uB984\t\t\uC11C\uBC84 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\n\t---------\t-----------------\t\t------------------\n
+servertool.list2=\n\t\uC11C\uBC84 ID\t\uC11C\uBC84 \uD074\uB798\uC2A4 \uC774\uB984\t\t\uC11C\uBC84 \uC560\uD50C\uB9AC\uCF00\uC774\uC158\n\t---------\t-----------------\t\t------------------\n
servertool.listactive=\n\tlistactive
servertool.listactive1=\uD604\uC7AC \uD65C\uC131 \uC11C\uBC84 \uB098\uC5F4
servertool.listappnames=\tlistappnames\n
@@ -92,9 +92,9 @@
bootstrap.success=\uD3EC\uD2B8\uB97C {0}(\uC73C)\uB85C \uC124\uC815\uD558\uACE0 {1}\uC5D0\uC11C \uC11C\uBE44\uC2A4\uB97C \uC77D\uB294 \uC911
bootstrap.filenotreadable={0} \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
bootstrap.filenotfound={0} \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-bootstrap.exception={0} \uD30C\uC77C\uC5D0 \uC18D\uC131\uC744 \uC800\uC7A5\uD558\uB294 \uC911 \uC608\uC678 \uC0AC\uD56D \uBC1C\uC0DD: {1} \uC608\uC678 \uC0AC\uD56D
+bootstrap.exception={0} \uD30C\uC77C\uC5D0 \uC18D\uC131\uC744 \uC800\uC7A5\uD558\uB294 \uC911 \uC608\uC678\uC0AC\uD56D \uBC1C\uC0DD: {1} \uC608\uC678\uC0AC\uD56D
-tnameserv.exception={0} \uD3EC\uD2B8\uC5D0\uC11C \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uC11C\uBE44\uC2A4\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC608\uC678 \uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+tnameserv.exception={0} \uD3EC\uD2B8\uC5D0\uC11C \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uC11C\uBE44\uC2A4\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC608\uC678\uC0AC\uD56D\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
tnameserv.usage=-ORBInitialPort <portno> \uBA85\uB839\uD589 \uC778\uC218\uB85C \uB2E4\uB978 \uD3EC\uD2B8 \uC0AC\uC6A9 \uC2DC\uB3C4
tnameserv.invalidhostoption=ORBInitialHost\uB294 NameService\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC635\uC158\uC774 \uC544\uB2D9\uB2C8\uB2E4.
tnameserv.orbinitialport0=ORBInitialPort 0\uC740 NameService\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC635\uC158\uC774 \uC544\uB2D9\uB2C8\uB2E4.
@@ -103,5 +103,5 @@
tnameserv.hs3=\uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
orbd.commfailure=\nORBinitialPort\uAC00 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC774\uC5B4\uC11C ORBD \uC2DC\uC791\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-orbd.internalexception=\n\uB0B4\uBD80 \uC608\uC678 \uC0AC\uD56D\uC73C\uB85C \uC778\uD574 ORBD \uC2DC\uC791\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \n\uAC00\uB2A5\uD55C \uC6D0\uC778: \n1. \uC9C0\uC815\uB41C ORBInitialPort \uB610\uB294 ORBActivationPort\uAC00 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.\n2. orb.db\uB97C \uC4F8 \uC218 \uC788\uB294 \uC4F0\uAE30 \uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
+orbd.internalexception=\n\uB0B4\uBD80 \uC608\uC678\uC0AC\uD56D\uC73C\uB85C \uC778\uD574 ORBD \uC2DC\uC791\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \n\uAC00\uB2A5\uD55C \uC6D0\uC778: \n1. \uC9C0\uC815\uB41C ORBInitialPort \uB610\uB294 ORBActivationPort\uAC00 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.\n2. orb.db\uB97C \uC4F8 \uC218 \uC788\uB294 \uC4F0\uAE30 \uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties Mon Aug 08 15:51:25 2016 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -103,5 +103,5 @@
tnameserv.hs3=\u5C31\u7DD2\u3002
orbd.commfailure=\n\u56E0\u70BA ORBinitialPort \u5728\u4F7F\u7528\u4E2D\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002
-orbd.internalexception=\n\u56E0\u70BA\u5167\u90E8\u767C\u751F\u7570\u5E38\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002 \n\u53EF\u80FD\u7684\u539F\u56E0: \n1. \u6307\u5B9A\u7684 ORBInitialPort \u6216 ORBActivationPort \u5728\u4F7F\u7528\u4E2D\u3002 \n2. \u6C92\u6709\u5BEB\u5165 orb.db \u7684\u6B0A\u9650\u3002
+orbd.internalexception=\n\u56E0\u70BA\u5167\u90E8\u767C\u751F\u7570\u5E38\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002\n\u53EF\u80FD\u7684\u539F\u56E0: \n1. \u6307\u5B9A\u7684 ORBInitialPort \u6216 ORBActivationPort \u5728\u4F7F\u7528\u4E2D\u3002\n2. \u6C92\u6709\u5BEB\u5165 orb.db \u7684\u6B0A\u9650\u3002
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java Mon Aug 08 15:51:25 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java Mon Aug 08 15:51:25 2016 +0100
@@ -54,11 +54,17 @@
{
protected Collection connectionCache;
+ private Acceptor acceptor;
+
public CorbaInboundConnectionCacheImpl(ORB orb, Acceptor acceptor)
{
super(orb, acceptor.getConnectionCacheType(),
((CorbaAcceptor)acceptor).getMonitoringName());
this.connectionCache = new ArrayList();
+ this.acceptor = acceptor;
+ if (orb.transportDebugFlag) {
+ dprint(": " + acceptor );
+ }
}
////////////////////////////////////////////////////
@@ -66,11 +72,25 @@
// pept.transport.InboundConnectionCache
//
+ public void close () {
+
+ super.close();
+ if (orb.transportDebugFlag) {
+ dprint(".close: " + acceptor );
+ }
+ this.acceptor.close();
+
+ }
+
public Connection get(Acceptor acceptor)
{
throw wrapper.methodShouldNotBeCalled();
}
+ public Acceptor getAcceptor () {
+ return acceptor;
+ }
+
public void put(Acceptor acceptor, Connection connection)
{
if (orb.transportDebugFlag) {
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java Mon Aug 08 15:51:25 2016 +0100
@@ -188,8 +188,9 @@
for (Object cc : outboundConnectionCaches.values()) {
((ConnectionCache)cc).close() ;
}
- for (Object cc : inboundConnectionCaches.values()) {
- ((ConnectionCache)cc).close() ;
+ for (Object icc : inboundConnectionCaches.values()) {
+ ((ConnectionCache)icc).close() ;
+ unregisterAcceptor(((InboundConnectionCache)icc).getAcceptor());
}
getSelector(0).close();
} finally {
diff -r 223d0e48a55b -r 459f130b3f85 src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java Mon Jan 25 13:20:44 2016 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java Mon Aug 08 15:51:25 2016 +0100
@@ -26,16 +26,20 @@
package com.sun.corba.se.impl.transport;
import java.io.IOException;
+import java.net.ServerSocket;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectableChannel;
+import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
+import java.nio.channels.ClosedSelectorException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
import java.util.List;
+
import com.sun.corba.se.pept.broker.Broker;
import com.sun.corba.se.pept.transport.Acceptor;
import com.sun.corba.se.pept.transport.Connection;
@@ -111,7 +115,16 @@
interestOpsList.add(keyAndOp);
}
// tell Selector Thread there's an update to a SelectorKey's Ops
- selector.wakeup();
+ try {
+ if (selector != null) {
+ // wakeup Selector thread to process close request
+ selector.wakeup();
+ }
+ } catch (Throwable t) {
+ if (orb.transportDebugFlag) {
+ dprint(".registerInterestOps: selector.wakeup: ", t);
+ }
+ }
}
else {
wrapper.selectionKeyInvalid(eventHandler.toString());
@@ -186,7 +199,9 @@
if (selectionKey != null) {
selectionKey.cancel();
}
- selector.wakeup();
+ if (selector != null) {
+ selector.wakeup();
+ }
return;
}
@@ -239,6 +254,8 @@
readerThread.close();
}
More information about the distro-pkg-dev
mailing list