/hg/release/icedtea7-forest-2.4/corba: 53 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 16 07:41:22 PDT 2013
changeset 8dddd1c2fd9e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8dddd1c2fd9e
author: msheppar
date: Fri Jun 14 17:45:07 2013 +0100
8011157: Improve CORBA portablility
Summary: fix also reviewed by Alexander Fomin
Reviewed-by: alanb, coffeys, skoivu
changeset fc434680b23c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fc434680b23c
author: asaha
date: Wed Jun 19 21:51:02 2013 -0700
Merge
changeset 96c4e7c84230 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=96c4e7c84230
author: asaha
date: Thu Jun 20 21:50:24 2013 -0700
Merge
changeset 4f54264ca4df in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4f54264ca4df
author: asaha
date: Fri Jun 21 21:56:37 2013 -0700
Merge
changeset eb228b67522e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eb228b67522e
author: katleman
date: Tue Jul 02 15:17:11 2013 -0700
Added tag jdk7u45-b01 for changeset 4f54264ca4df
changeset 8c4894c44f92 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8c4894c44f92
author: asaha
date: Tue Jul 02 15:25:18 2013 -0700
Merge
changeset 462d171e9097 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=462d171e9097
author: asaha
date: Tue Jul 02 15:28:07 2013 -0700
Merge
changeset 1a1a1dedf437 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1a1a1dedf437
author: asaha
date: Wed Jul 03 17:35:01 2013 -0700
Merge
changeset 43cf19188238 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=43cf19188238
author: katleman
date: Tue Jul 09 18:22:42 2013 -0700
Added tag jdk7u45-b02 for changeset 1a1a1dedf437
changeset 3a2cca8c2f20 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3a2cca8c2f20
author: asaha
date: Wed Jul 10 16:29:39 2013 -0700
Merge
changeset 38acb2b8e5c5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=38acb2b8e5c5
author: cl
date: Tue Jul 16 05:51:53 2013 -0700
Added tag jdk7u45-b03 for changeset 3a2cca8c2f20
changeset 8cce3b403b3e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8cce3b403b3e
author: mchung
date: Thu Jul 18 17:22:25 2013 -0700
8017196: Ensure Proxies are handled appropriately
Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar
changeset 7cfa75064d07 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7cfa75064d07
author: asaha
date: Wed Jul 17 13:53:50 2013 -0700
Merge
changeset 4f4f7869bd65 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4f4f7869bd65
author: asaha
date: Mon Jul 22 12:09:13 2013 -0700
Merge
changeset 7fd80a3a030b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7fd80a3a030b
author: cl
date: Tue Jul 23 08:11:10 2013 -0700
Added tag jdk7u45-b04 for changeset 4f4f7869bd65
changeset 4e6f135b2779 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4e6f135b2779
author: asaha
date: Thu Jul 25 15:39:19 2013 -0700
Merge
changeset b23aed280f64 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b23aed280f64
author: asaha
date: Mon Jul 29 11:53:43 2013 -0700
Merge
changeset faee62d13040 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=faee62d13040
author: asaha
date: Wed Jul 31 23:03:33 2013 -0700
Merge
changeset 45f6e6fc71c4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=45f6e6fc71c4
author: asaha
date: Fri Aug 02 15:22:29 2013 -0700
Added tag jdk7u45-b05 for changeset faee62d13040
changeset b7baf058aef2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b7baf058aef2
author: asaha
date: Fri Aug 02 15:45:38 2013 -0700
Merge
changeset a23c053ff460 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a23c053ff460
author: cl
date: Fri Aug 02 19:02:54 2013 -0700
Added tag jdk7u45-b05 for changeset 4e6f135b2779
changeset b2871fcc688f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b2871fcc688f
author: asaha
date: Mon Aug 05 11:50:20 2013 -0700
8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
Reviewed-by: cl
changeset 37de564abe4c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=37de564abe4c
author: asaha
date: Mon Aug 05 14:57:54 2013 -0700
Merge
changeset 435dd0e1ab9e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=435dd0e1ab9e
author: asaha
date: Wed Aug 07 12:21:06 2013 -0700
Merge
changeset fb777d9d95dc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fb777d9d95dc
author: cl
date: Thu Aug 08 23:23:14 2013 -0700
Added tag jdk7u45-b06 for changeset 435dd0e1ab9e
changeset 2e19615f6045 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2e19615f6045
author: asaha
date: Mon Aug 12 12:30:45 2013 -0700
Merge
changeset a2ac8c815b06 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a2ac8c815b06
author: cl
date: Thu Aug 15 22:16:15 2013 -0700
Added tag jdk7u45-b07 for changeset 2e19615f6045
changeset 771c5c869d16 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=771c5c869d16
author: asaha
date: Mon Aug 19 12:41:46 2013 -0700
Merge
changeset 30130bd0e11e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=30130bd0e11e
author: cl
date: Tue Aug 20 10:22:16 2013 -0700
Added tag jdk7u45-b08 for changeset 771c5c869d16
changeset 5f4c2a41513c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5f4c2a41513c
author: asaha
date: Thu Aug 22 08:38:38 2013 -0700
Merge
changeset 366385ab5e9b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=366385ab5e9b
author: msheppar
date: Mon Aug 19 17:01:51 2013 +0100
8022940: Enhance CORBA translations
Reviewed-by: coffeys, alanb, skoivu
changeset 1a13a3a11b2e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1a13a3a11b2e
author: asaha
date: Tue Aug 20 10:50:08 2013 -0700
Merge
changeset c61913c4ad0a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c61913c4ad0a
author: asaha
date: Thu Aug 22 08:53:11 2013 -0700
Merge
changeset a89d69bef361 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a89d69bef361
author: asaha
date: Mon Aug 26 08:41:01 2013 -0700
Merge
changeset 1e450f9795be in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1e450f9795be
author: cl
date: Tue Aug 27 10:56:00 2013 -0700
Added tag jdk7u45-b09 for changeset a89d69bef361
changeset fd8a2041b75c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fd8a2041b75c
author: asaha
date: Tue Aug 27 15:13:36 2013 -0700
Merge
changeset 4723f2a4bf50 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4723f2a4bf50
author: cl
date: Wed Sep 04 11:05:00 2013 -0700
Added tag jdk7u45-b10 for changeset fd8a2041b75c
changeset 55e0d3d95143 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=55e0d3d95143
author: asaha
date: Wed Sep 04 12:05:49 2013 -0700
Merge
changeset 336566c2905a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=336566c2905a
author: cl
date: Wed Sep 11 11:12:08 2013 -0700
Added tag jdk7u45-b11 for changeset 55e0d3d95143
changeset 6cadc3dd82a4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6cadc3dd82a4
author: cl
date: Wed Sep 18 02:15:45 2013 -0700
Added tag jdk7u45-b12 for changeset 336566c2905a
changeset 43e22471d0c2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=43e22471d0c2
author: cl
date: Mon Sep 23 14:31:21 2013 -0700
Added tag jdk7u45-b13 for changeset 6cadc3dd82a4
changeset 3d7a52de59f0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3d7a52de59f0
author: cl
date: Thu Sep 26 10:37:08 2013 -0700
Added tag jdk7u45-b14 for changeset 43e22471d0c2
changeset b1f069eb48ed in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b1f069eb48ed
author: cl
date: Fri Sep 27 11:44:16 2013 -0700
Added tag jdk7u45-b15 for changeset 3d7a52de59f0
changeset c9c225fb19c3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c9c225fb19c3
author: katleman
date: Wed Sep 11 10:59:40 2013 -0700
Added tag jdk7u40-b61 for changeset 504acad33722
changeset a09bfe5b7f69 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a09bfe5b7f69
author: katleman
date: Tue Sep 17 13:05:15 2013 -0700
Added tag jdk7u40-b62 for changeset c9c225fb19c3
changeset 19a9832f198c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=19a9832f198c
author: asaha
date: Thu Sep 19 14:38:34 2013 -0700
Merge
changeset 0e8dd12ebf65 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0e8dd12ebf65
author: asaha
date: Fri Sep 27 13:06:14 2013 -0700
Merge
changeset 8b8793f06c56 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8b8793f06c56
author: cl
date: Thu Oct 03 11:31:39 2013 -0700
Added tag jdk7u45-b16 for changeset b1f069eb48ed
changeset 80f65a8f5850 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=80f65a8f5850
author: cl
date: Mon Oct 07 21:52:19 2013 -0700
Added tag jdk7u45-b17 for changeset 8b8793f06c56
changeset a15e4a545044 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a15e4a545044
author: cl
date: Tue Oct 08 09:06:43 2013 -0700
Added tag jdk7u45-b18 for changeset 80f65a8f5850
changeset 264523aa4163 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=264523aa4163
author: cl
date: Tue Oct 08 10:57:34 2013 -0700
Added tag jdk7u45-b30 for changeset a15e4a545044
changeset b7fb35bbe70d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b7fb35bbe70d
author: asaha
date: Tue Oct 08 11:10:17 2013 -0700
Merge
changeset 8ed5df839fbc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8ed5df839fbc
author: andrew
date: Wed Oct 16 15:17:36 2013 +0100
Merge jdk7u45-b31
diffstat:
.hgtags | 109 ++++++++++
.jcheck/conf | 2 -
THIRD_PARTY_README | 33 ++-
make/Makefile | 2 +-
make/common/shared/Defs-java.gmk | 2 +-
make/common/shared/Platform.gmk | 9 +
src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties | 8 +-
src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties | 2 +-
src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java | 24 --
src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java | 14 +-
src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java | 73 ++++--
src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java | 4 +-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 3 +-
src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java | 11 +
src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp | 8 +-
src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp | 6 +-
src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java | 55 +++-
src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp | 5 +-
src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp | 2 +-
src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java | 80 +++++++-
21 files changed, 350 insertions(+), 107 deletions(-)
diffs (truncated from 991 to 500 lines):
diff -r d77153cbe030 -r 8ed5df839fbc .hgtags
--- a/.hgtags Wed Jun 12 20:18:16 2013 -0700
+++ b/.hgtags Wed Oct 16 15:17:36 2013 +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
@@ -123,6 +126,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
@@ -141,6 +145,7 @@
56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
@@ -157,6 +162,7 @@
23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10
bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
+9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
@@ -191,6 +197,7 @@
8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15
7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16
e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17
+68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint
b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18
5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19
f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20
@@ -240,6 +247,31 @@
b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10
f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30
b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20
+353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01
+d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02
+7c62cfa17e9613bf69d4f9b2ae74f3724d7a2955 jdk7u8-b03
+86961c802e87688ff264a946ca647d062f538302 jdk7u8-b04
+a274cd0c309b4da766dc73cac644cb44f1c23787 jdk7u8-b05
+292eab1079e7b62db7cf848781eddf1b6fc718e5 jdk7u10-b06
+ff5e33bcfc2bb7c2a69cd20b91490922eb158af2 jdk7u10-b07
+76811225baeccd3ed77a3e2ec7745ba3d42acff5 jdk7u10-b08
+f8e8ef8e0a5eea83938dab38d9a8cf6354f5a92d jdk7u10-b09
+3f309ff1d8ecd0210340ae9cfb40cc9072f66757 jdk7u12-b01
+06a04d95a12f18f07610f5d787324e2ea15e6376 jdk7u12-b02
+665ee21ff3ef309147e7f7872e2d4f446a31b642 jdk7u12-b03
+f89f101d3dfea98b143b693cebccdefc89b691ff jdk7u12-b04
+2516fd4adf4af010c217e073cdb0a1fa9eefd827 jdk7u12-b05
+16287175b517e48da9b24d31a3e9da200b6bc563 jdk7u12-b06
+7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
+6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
+c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
+3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
+3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
+fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
+cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13
+9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14
+2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15
622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01
30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02
7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30
@@ -264,7 +296,9 @@
b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
+fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50
fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
+c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31
3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
@@ -276,9 +310,84 @@
161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
+38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
+8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
+862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
+54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
+e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
+d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
+d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
+abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
+be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
+f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
+c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
+1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15
+ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31
+9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33
+1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34
f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30
65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16
+d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32
+38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
+8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
+862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
+54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
+fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
+e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
+d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
+d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
+abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
+be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
+f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
+c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
+1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
+651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
+3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
+c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
+1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
+ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34
+fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35
+cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36
+dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37
+8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38
+d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39
+a91b57bf60bd982814bc1616ea46a1069416f5e4 jdk7u40-b40
+acb0571052b8dbef036fc50235ef95c0a46cff6b jdk7u40-b41
+b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
+e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
+08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
+5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2
+504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
+c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
+4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
+1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
+3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
+4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04
+faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
+435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06
+2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07
+771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08
+a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
+fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
+55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
+336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
+6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13
+43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14
+3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15
+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
+8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
+80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
+a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
diff -r d77153cbe030 -r 8ed5df839fbc .jcheck/conf
--- a/.jcheck/conf Wed Jun 12 20:18:16 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r d77153cbe030 -r 8ed5df839fbc THIRD_PARTY_README
--- a/THIRD_PARTY_README Wed Jun 12 20:18:16 2013 -0700
+++ b/THIRD_PARTY_README Wed Oct 16 15:17:36 2013 +0100
@@ -1912,6 +1912,35 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Derby 10.8.3.0 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.10.0
+ Apache Xerces2 Java 2.11.0
Apache XML Resolver 1.1
diff -r d77153cbe030 -r 8ed5df839fbc make/Makefile
--- a/make/Makefile Wed Jun 12 20:18:16 2013 -0700
+++ b/make/Makefile Wed Oct 16 15:17:36 2013 +0100
@@ -150,7 +150,7 @@
#----- bin.zip
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
+BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
BIN_ZIP = $(LIB_DIR)/bin.zip
$(BIN_ZIP): $(BIN_ZIP_FILES)
diff -r d77153cbe030 -r 8ed5df839fbc make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk Wed Jun 12 20:18:16 2013 -0700
+++ b/make/common/shared/Defs-java.gmk Wed Oct 16 15:17:36 2013 +0100
@@ -81,7 +81,7 @@
ifeq ($(ARCH_DATA_MODEL), 32)
JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
diff -r d77153cbe030 -r 8ed5df839fbc make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Wed Jun 12 20:18:16 2013 -0700
+++ b/make/common/shared/Platform.gmk Wed Oct 16 15:17:36 2013 +0100
@@ -153,6 +153,9 @@
OS_VERSION := $(shell uname -r)
# Arch and OS name/version
mach := $(shell uname -m)
+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+ mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
+ endif
archExpr = case "$(mach)" in \
i[3-9]86) \
echo i586 \
@@ -169,6 +172,9 @@
arm*) \
echo arm \
;; \
+ sh*) \
+ echo sh \
+ ;; \
*) \
echo $(mach) \
;; \
@@ -196,6 +202,9 @@
else
ARCH_DATA_MODEL=64
endif
+ ifeq ($(ARCH), sh)
+ ARCH_DATA_MODEL=32
+ endif
endif
endif
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Oct 16 15:17:36 2013 +0100
@@ -2190,10 +2190,7 @@
if (labelIndex == _unionLabels.length) {
// check if label has not been found
- if (_defaultIndex == -1)
- // throw exception if default was not expected
- throw wrapper.unexpectedUnionDefault() ;
- else
+ if (_defaultIndex != -1)
// must be of the default branch type
_memberTypes[_defaultIndex].copy(src, dst);
}
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Wed Oct 16 15:17:36 2013 +0100
@@ -60,12 +60,12 @@
servertool.getserverid1=applicationName\u306E\u30B5\u30FC\u30D0\u30FCID\u3092\u8FD4\u3057\u307E\u3059
servertool.getserverid2=\tapplicationName {0}\u306E\u30B5\u30FC\u30D0\u30FCID\u306F{1}\u3067\u3059
-servertool.list=\n\t\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n
+servertool.list=\n\tlist\n
servertool.list1=\u767B\u9332\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
servertool.list2=\n\t\u30B5\u30FC\u30D0\u30FCID\t\u30B5\u30FC\u30D0\u30FC\u306E\u30AF\u30E9\u30B9\u540D\t\t\u30B5\u30FC\u30D0\u30FC\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\n\t---------\t----------------\t\t----------------------\n
-servertool.listactive=\n\t\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
+servertool.listactive=\n\tlistactive
servertool.listactive1=\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
-servertool.listappnames=\tapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n
+servertool.listappnames=\tlistappnames\n
servertool.listappnames1=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308BapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
servertool.listappnames2=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B5\u30FC\u30D0\u30FCapplicationNames:
@@ -76,7 +76,7 @@
servertool.startserver1=\u767B\u9332\u3055\u308C\u305F\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u307E\u3059
servertool.startserver2=\t\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002
-servertool.quit=\n\t\u7D42\u4E86\u3057\u307E\u3059\n
+servertool.quit=\n\tquit\n
servertool.quit1=\u3053\u306E\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059
servertool.help=\thelp\n\t\u307E\u305F\u306F\n\thelp <command name>\n
diff -r d77153cbe030 -r 8ed5df839fbc 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 Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties Wed Oct 16 15:17:36 2013 +0100
@@ -26,7 +26,7 @@
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
+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
servertool.shorthelp=\n\n\t\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBA85\uB839: \n\t------------------- \n
servertool.baddef=\uC798\uBABB\uB41C \uC11C\uBC84 \uC815\uC758: {0}
servertool.nosuchserver=\t\uD574\uB2F9 \uC11C\uBC84\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Wed Oct 16 15:17:36 2013 +0100
@@ -905,28 +905,4 @@
return contents.toString();
}
-
- public static void main(String[] args) {
-
- Class remoteInterface = java.rmi.Remote.class;
-
- if( args.length > 0 ) {
- String className = args[0];
- try {
- remoteInterface = Class.forName(className);
- } catch(Exception e) {
- e.printStackTrace();
- System.exit(-1);
- }
- }
-
- System.out.println("Building name translation for " + remoteInterface);
- try {
- IDLNameTranslator nameTranslator =
- IDLNameTranslatorImpl.get(remoteInterface);
- System.out.println(nameTranslator);
- } catch(IllegalStateException ise) {
- ise.printStackTrace();
- }
- }
}
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Wed Oct 16 15:17:36 2013 +0100
@@ -43,6 +43,8 @@
import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
{
@@ -114,24 +116,32 @@
// which extends org.omg.CORBA.Object. This handler delegates all
// calls directly to a DynamicStubImpl, which extends
// org.omg.CORBA.portable.ObjectImpl.
- InvocationHandler dynamicStubHandler =
+ final InvocationHandler dynamicStubHandler =
DelegateInvocationHandlerImpl.create( stub ) ;
// Create an invocation handler that handles any remote interface
// methods.
- InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+ final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
pm, classData, stub ) ;
// Create a composite handler that handles the DynamicStub interface
// as well as the remote interfaces.
final CompositeInvocationHandler handler =
new CustomCompositeInvocationHandlerImpl( stub ) ;
+
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
handler.addInvocationHandler( DynamicStub.class,
dynamicStubHandler ) ;
handler.addInvocationHandler( org.omg.CORBA.Object.class,
dynamicStubHandler ) ;
handler.addInvocationHandler( Object.class,
dynamicStubHandler ) ;
+ return null;
+ }
+ });
+
// If the method passed to invoke is not from DynamicStub or its superclasses,
// it must be from an implemented interface, so we just handle
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java Wed Oct 16 15:17:36 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, 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
@@ -25,7 +25,10 @@
package com.sun.corba.se.impl.transport;
-import java.util.Hashtable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.SystemException;
@@ -68,7 +71,7 @@
private CorbaConnection connection;
// Maps requestId to an OutCallDesc.
- private Hashtable out_calls = null; // REVISIT - use int hastable/map
+ final private Map<Integer, OutCallDesc> out_calls;
public CorbaResponseWaitingRoomImpl(ORB orb, CorbaConnection connection)
{
@@ -76,7 +79,8 @@
wrapper = ORBUtilSystemException.get( orb,
CORBALogDomains.RPC_TRANSPORT ) ;
this.connection = connection;
- out_calls = new Hashtable();
+ out_calls =
+ Collections.synchronizedMap(new HashMap<Integer, OutCallDesc>());
}
////////////////////////////////////////////////////
@@ -139,7 +143,7 @@
return null;
}
- OutCallDesc call = (OutCallDesc)out_calls.get(requestId);
+ OutCallDesc call = out_calls.get(requestId);
if (call == null) {
throw wrapper.nullOutCall(CompletionStatus.COMPLETED_MAYBE);
}
@@ -197,7 +201,7 @@
LocateReplyOrReplyMessage header = (LocateReplyOrReplyMessage)
inputObject.getMessageHeader();
Integer requestId = new Integer(header.getRequestId());
- OutCallDesc call = (OutCallDesc) out_calls.get(requestId);
+ OutCallDesc call = out_calls.get(requestId);
if (orb.transportDebugFlag) {
dprint(".responseReceived: id/"
@@ -248,7 +252,6 @@
public int numberRegistered()
{
More information about the distro-pkg-dev
mailing list