/hg/release/icedtea7-forest-2.4/corba: 44 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 17 12:23:35 PST 2014
changeset d641ac83157e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d641ac83157e
author: cl
date: Wed Oct 09 09:34:40 2013 -0700
Added tag jdk7u45-b31 for changeset b7fb35bbe70d
changeset 59d790829419 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=59d790829419
author: asaha
date: Wed Sep 11 15:47:47 2013 -0700
Merge
changeset 3832ff63e7fc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3832ff63e7fc
author: asaha
date: Wed Sep 18 11:16:15 2013 -0700
Merge
changeset 3092a6420d0d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3092a6420d0d
author: asaha
date: Wed Sep 18 11:29:28 2013 -0700
Merge
changeset e379f8068ea6 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e379f8068ea6
author: asaha
date: Thu Sep 19 15:31:27 2013 -0700
Merge
changeset 694aaf53fcc2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=694aaf53fcc2
author: asaha
date: Tue Sep 24 10:52:15 2013 -0700
Merge
changeset 0540b0b57ce4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0540b0b57ce4
author: asaha
date: Thu Sep 26 11:22:55 2013 -0700
Merge
changeset fd88b48792ce in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fd88b48792ce
author: asaha
date: Fri Sep 27 12:14:29 2013 -0700
Merge
changeset bdd1f5afad32 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bdd1f5afad32
author: asaha
date: Fri Sep 27 13:16:02 2013 -0700
Merge
changeset 419d784bf801 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=419d784bf801
author: asaha
date: Mon Sep 30 10:59:22 2013 -0700
Added tag jdk7u51-b00 for changeset b1f069eb48ed
changeset 8d884cf2e8cc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8d884cf2e8cc
author: asaha
date: Mon Sep 30 11:11:49 2013 -0700
Merge
changeset 8ce0ac5270b8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8ce0ac5270b8
author: cl
date: Tue Oct 01 08:36:35 2013 -0700
Added tag jdk7u51-b01 for changeset 8d884cf2e8cc
changeset d927facb63bc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d927facb63bc
author: asaha
date: Tue Oct 08 11:42:19 2013 -0700
Merge
changeset 327035fbb043 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=327035fbb043
author: asaha
date: Wed Oct 09 09:49:41 2013 -0700
Merge
changeset 3c186a6d2b86 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3c186a6d2b86
author: cl
date: Thu Oct 10 10:16:25 2013 -0700
Added tag jdk7u51-b02 for changeset 327035fbb043
changeset 6969598640b2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6969598640b2
author: cl
date: Tue Oct 15 09:31:50 2013 -0700
Added tag jdk7u51-b03 for changeset 3c186a6d2b86
changeset b18c17608d94 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b18c17608d94
author: cl
date: Tue Oct 22 22:23:33 2013 -0700
Added tag jdk7u51-b04 for changeset 6969598640b2
changeset 1c997cdaf0f8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1c997cdaf0f8
author: cl
date: Tue Oct 29 09:08:49 2013 -0700
Added tag jdk7u51-b05 for changeset b18c17608d94
changeset d39d92c2cab1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d39d92c2cab1
author: alanb
date: Tue Oct 22 11:40:27 2013 +0100
8021257: com.sun.corba.se.** should be on restricted package list
Reviewed-by: chegar, coffeys, smarks
Contributed-by: alan.bateman at oralce.com, mark.sheppard at oracle.com
changeset 863d69d3dee0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=863d69d3dee0
author: asaha
date: Mon Nov 04 10:58:30 2013 -0800
Merge
changeset 8f9d49f7e74c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8f9d49f7e74c
author: cl
date: Tue Nov 05 10:57:55 2013 -0800
Added tag jdk7u51-b06 for changeset 863d69d3dee0
changeset 77d13acb85bf in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=77d13acb85bf
author: asaha
date: Tue Oct 29 09:54:26 2013 -0700
Merge
changeset b1548473f261 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b1548473f261
author: msheppar
date: Sat Nov 02 01:07:53 2013 +0000
8026193: Enhance CORBA stub factories
Summary: modify com.sun.corba.se.impl.presenetation.rmi.StubFactoryDynamicBase inheritance structure.
Reviewed-by: alanb, coffeys, ahgross
changeset 0a879f00b698 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0a879f00b698
author: msheppar
date: Sat Nov 02 01:24:03 2013 +0000
8025767: Enhance IIOP Streams
Summary: modify org.omg.CORBA_2_3.portable.InputStream inheritance structure.
Reviewed-by: alanb, coffeys, skoivu
changeset 880cc2c3ba33 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=880cc2c3ba33
author: asaha
date: Tue Nov 05 12:03:01 2013 -0800
Merge
changeset 3910fba40bac in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3910fba40bac
author: mfang
date: Thu Nov 07 12:16:35 2013 -0800
8027787: 7u51 l10n resource file translation update 1
Reviewed-by: yhuang
changeset 4baf8650e2c5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4baf8650e2c5
author: mfang
date: Thu Nov 07 12:50:44 2013 -0800
Merge
changeset 3f6dfcad33ac in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3f6dfcad33ac
author: coffeys
date: Mon Nov 11 15:52:11 2013 +0000
8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
Reviewed-by: dholmes
changeset 652dbc49eb47 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=652dbc49eb47
author: cl
date: Tue Nov 12 08:51:29 2013 -0800
Added tag jdk7u51-b07 for changeset 3f6dfcad33ac
changeset 8ce01c9da345 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8ce01c9da345
author: mchung
date: Thu Nov 07 20:48:38 2013 -0800
8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45
Reviewed-by: msheppar, alanb, lancea
changeset 2ef8307ce38d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2ef8307ce38d
author: coffeys
date: Mon Nov 11 15:52:11 2013 +0000
8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
Reviewed-by: dholmes
changeset 00c7d4007a2f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=00c7d4007a2f
author: asaha
date: Tue Nov 12 09:10:10 2013 -0800
Merge
changeset 07177000db8f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=07177000db8f
author: cl
date: Tue Nov 19 08:36:51 2013 -0800
Added tag jdk7u51-b08 for changeset 00c7d4007a2f
changeset bb45667f58f5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bb45667f58f5
author: msheppar
date: Sun Nov 24 13:09:01 2013 +0000
8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
Summary: check for default ORBImpl and ORBSingleton set via properties or System properties
Reviewed-by: alanb, coffeys, mchung
changeset eecfc296009b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eecfc296009b
author: asaha
date: Wed Nov 27 08:19:21 2013 -0800
Added tag jdk7u51-b09 for changeset bb45667f58f5
changeset a26d0e8ab102 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a26d0e8ab102
author: katleman
date: Wed Dec 04 10:10:56 2013 -0800
Added tag jdk7u51-b10 for changeset eecfc296009b
changeset 55a509ccc0e4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=55a509ccc0e4
author: katleman
date: Tue Dec 10 13:15:40 2013 -0800
Added tag jdk7u51-b11 for changeset a26d0e8ab102
changeset e2f0036f712a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e2f0036f712a
author: katleman
date: Sat Dec 14 11:51:09 2013 -0800
Added tag jdk7u51-b12 for changeset 55a509ccc0e4
changeset aa24e046a2da in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=aa24e046a2da
author: cl
date: Mon Nov 25 11:02:17 2013 -0800
Added tag jdk7u45-b33 for changeset d641ac83157e
changeset fab1423e6ab8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fab1423e6ab8
author: katleman
date: Fri Dec 06 13:07:14 2013 -0800
Added tag jdk7u45-b34 for changeset aa24e046a2da
changeset bdfd3d51d3c9 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bdfd3d51d3c9
author: asaha
date: Tue Dec 17 11:01:12 2013 -0800
Merge
changeset 6563d12c48c9 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6563d12c48c9
author: katleman
date: Thu Dec 19 09:00:44 2013 -0800
Added tag jdk7u51-b13 for changeset e2f0036f712a
changeset 0ad990211737 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0ad990211737
author: asaha
date: Thu Dec 19 09:31:40 2013 -0800
Merge
changeset 721b1070efda in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=721b1070efda
author: andrew
date: Fri Jan 17 20:22:44 2014 +0000
Merge jdk7u51-b31
diffstat:
.hgtags | 30 +
.jcheck/conf | 2 -
make/Makefile | 4 +-
make/common/shared/Defs-java.gmk | 2 +-
make/common/shared/Platform.gmk | 9 +
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 17 +-
src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java | 7 +-
src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java | 14 +-
src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java | 14 +-
src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +-
src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 7 +-
src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 14 +-
src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +-
src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 8 +-
src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java | 6 +-
src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 6 +-
src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java | 24 +-
src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java | 17 +-
src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java | 7 +-
src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java | 35 +-
src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java | 8 +-
src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java | 2 +
src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java | 15 +-
src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp | 2 +-
src/share/classes/javax/rmi/CORBA/Stub.java | 8 +-
src/share/classes/javax/rmi/CORBA/Util.java | 13 +-
src/share/classes/javax/rmi/PortableRemoteObject.java | 11 +-
src/share/classes/org/omg/CORBA/ORB.java | 39 +-
src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java | 43 ++-
src/share/classes/sun/corba/EncapsInputStreamFactory.java | 153 ++++++++++
30 files changed, 409 insertions(+), 118 deletions(-)
diffs (truncated from 1219 to 500 lines):
diff -r b7fb35bbe70d -r 721b1070efda .hgtags
--- a/.hgtags Tue Oct 08 11:10:17 2013 -0700
+++ b/.hgtags Fri Jan 17 20:22:44 2014 +0000
@@ -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
@@ -258,6 +265,7 @@
7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
@@ -335,6 +343,7 @@
bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
@@ -345,6 +354,7 @@
c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
@@ -359,6 +369,7 @@
b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
+5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2
504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
@@ -380,3 +391,22 @@
8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+8ed5df839fbccdb20f2718626402d28e5ea33542 icedtea-2.4.3
+468a4fe3400a2f6fd85f4e9023feb3b11e5edf1c icedtea-2.4.4
+b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
+d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33
+aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34
+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
+8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
+327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
+3c186a6d2b86ec4c6cfb093969d5f4e4a6ef6a98 jdk7u51-b03
+6969598640b2a4731634669eb1402a6af5772b44 jdk7u51-b04
+b18c17608d944028724858e1f768fb0a59dc8220 jdk7u51-b05
+863d69d3dee00e7958ed1014e7600cc08f2655e7 jdk7u51-b06
+3f6dfcad33acb0251c60facb6b5e8dbff41a4114 jdk7u51-b07
+00c7d4007a2f22deb05753bbd2d36f0ce43ac786 jdk7u51-b08
+bb45667f58f57f96c00551db26ab281bd101e892 jdk7u51-b09
+eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
+a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
+e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
diff -r b7fb35bbe70d -r 721b1070efda .jcheck/conf
--- a/.jcheck/conf Tue Oct 08 11:10:17 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r b7fb35bbe70d -r 721b1070efda make/Makefile
--- a/make/Makefile Tue Oct 08 11:10:17 2013 -0700
+++ b/make/Makefile Fri Jan 17 20:22:44 2014 +0000
@@ -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)
@@ -160,7 +160,7 @@
#
# CORBA
#
-SUBDIRS = tools javax org sun com
+SUBDIRS = tools sun/rmi javax org sun com
build:
$(SUBDIRS-loop)
diff -r b7fb35bbe70d -r 721b1070efda make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk Tue Oct 08 11:10:17 2013 -0700
+++ b/make/common/shared/Defs-java.gmk Fri Jan 17 20:22:44 2014 +0000
@@ -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 b7fb35bbe70d -r 721b1070efda make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Tue Oct 08 11:10:17 2013 -0700
+++ b/make/common/shared/Platform.gmk Fri Jan 17 20:22:44 2014 +0000
@@ -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 b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Fri Jan 17 20:22:44 2014 +0000
@@ -82,11 +82,18 @@
super((ORB)orb);
}
- public org.omg.CORBA.portable.InputStream create_input_stream()
- {
- return new AnyInputStream(
- (com.sun.corba.se.impl.encoding.EncapsInputStream)
- super.create_input_stream());
+ public org.omg.CORBA.portable.InputStream create_input_stream() {
+ final org.omg.CORBA.portable.InputStream is = super
+ .create_input_stream();
+ AnyInputStream aIS = AccessController
+ .doPrivileged(new PrivilegedAction<AnyInputStream>() {
+ @Override
+ public AnyInputStream run() {
+ return new AnyInputStream(
+ (com.sun.corba.se.impl.encoding.EncapsInputStream) is);
+ }
+ });
+ return aIS;
}
}
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,11 +36,10 @@
import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
import com.sun.corba.se.spi.orb.ORB;
-
import com.sun.corba.se.spi.logging.CORBALogDomains;
-
import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+import sun.corba.EncapsInputStreamFactory;
/**
* Encapsulations are supposed to explicitly define their
* code sets and GIOP version. The original resolution to issue 2784
@@ -148,7 +147,7 @@
}
public CDRInputStream dup() {
- return new EncapsInputStream(this);
+ return EncapsInputStreamFactory.newEncapsInputStream(this);
}
protected CodeSetConversion.BTCConverter createCharBTCConverter() {
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,6 +39,8 @@
import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
import com.sun.corba.se.impl.orbutil.ORBConstants;
+import sun.corba.EncapsInputStreamFactory;
+
/**
* Encapsulations are supposed to explicitly define their
* code sets and GIOP version. The original resolution to issue 2784
@@ -107,11 +109,11 @@
public org.omg.CORBA.portable.InputStream create_input_stream() {
freeInternalCaches();
- return new EncapsInputStream(orb(),
- getByteBuffer(),
- getSize(),
- isLittleEndian(),
- getGIOPVersion());
+ return EncapsInputStreamFactory.newEncapsInputStream(orb(),
+ getByteBuffer(),
+ getSize(),
+ isLittleEndian(),
+ getGIOPVersion());
}
protected CodeSetConversion.CTBConverter createCharCTBConverter() {
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -64,6 +64,8 @@
import com.sun.corba.se.impl.encoding.CDROutputStream;
import com.sun.corba.se.impl.encoding.MarshalInputStream;
+import sun.corba.EncapsInputStreamFactory;
+
public class TypeCodeInputStream extends EncapsInputStream implements TypeCodeReader
{
private Map typeMap = null;
@@ -157,11 +159,13 @@
// create an encapsulation using the marshal buffer
if (is instanceof CDRInputStream) {
- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length,
- ((CDRInputStream)is).isLittleEndian(),
- ((CDRInputStream)is).getGIOPVersion());
+ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
+ encapBuffer, encapBuffer.length,
+ ((CDRInputStream) is).isLittleEndian(),
+ ((CDRInputStream) is).getGIOPVersion());
} else {
- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length);
+ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
+ encapBuffer, encapBuffer.length);
}
encap.setEnclosingInputStream(is);
encap.makeEncapsulation();
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Fri Jan 17 20:22:44 2014 +0000
@@ -61,6 +61,8 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
+import sun.corba.EncapsInputStreamFactory;
+
public final class TypeCodeOutputStream extends EncapsOutputStream
{
private OutputStream enclosure = null;
@@ -77,9 +79,9 @@
public org.omg.CORBA.portable.InputStream create_input_stream()
{
- //return new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian());
- TypeCodeInputStream tcis
- = new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian(), getGIOPVersion());
+ TypeCodeInputStream tcis = EncapsInputStreamFactory
+ .newTypeCodeInputStream((ORB) orb(), getByteBuffer(),
+ getIndex(), isLittleEndian(), getGIOPVersion());
//if (TypeCodeImpl.debug) {
//System.out.println("Created TypeCodeInputStream " + tcis + " with no parent");
//tcis.printBuffer();
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Fri Jan 17 20:22:44 2014 +0000
@@ -33,6 +33,8 @@
import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
import com.sun.corba.se.spi.logging.CORBALogDomains;
+import sun.corba.EncapsInputStreamFactory;
+
import com.sun.corba.se.impl.corba.AnyImpl;
import com.sun.corba.se.impl.encoding.EncapsInputStream;
import com.sun.corba.se.impl.encoding.EncapsOutputStream;
@@ -193,8 +195,9 @@
// it is turned into a FormatMismatch exception.
try {
- EncapsInputStream cdrIn = new EncapsInputStream( orb, data,
- data.length, giopVersion );
+ EncapsInputStream cdrIn = EncapsInputStreamFactory.newEncapsInputStream( orb, data,
+ data.length, giopVersion );
+
cdrIn.consumeEndian();
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -370,7 +370,7 @@
* @exception IOException Any of the usual Input/Output related exceptions.
* @since JDK1.1
*/
- public final Object readObjectDelegate() throws IOException
+ public final synchronized Object readObjectDelegate() throws IOException
{
try {
@@ -389,7 +389,7 @@
}
}
- final Object simpleReadObject(Class clz,
+ final synchronized Object simpleReadObject(Class clz,
String repositoryID,
com.sun.org.omg.SendingContext.CodeBase sender,
int offset)
@@ -461,7 +461,7 @@
return obj;
}
- public final void simpleSkipObject(String repositoryID,
+ public final synchronized void simpleSkipObject(String repositoryID,
com.sun.org.omg.SendingContext.CodeBase sender)
/* throws OptionalDataException, ClassNotFoundException, IOException */
{
@@ -559,7 +559,7 @@
* objects.
* @since JDK1.1
*/
- public final void defaultReadObjectDelegate()
+ final synchronized void defaultReadObjectDelegate()
/* throws IOException, ClassNotFoundException, NotActiveException */
{
try {
@@ -988,7 +988,7 @@
}
}
- private Object inputObject(Class clz,
+ private synchronized Object inputObject(Class clz,
String repositoryID,
com.sun.org.omg.SendingContext.CodeBase sender,
int offset)
@@ -1317,7 +1317,7 @@
* a form of custom marshaling.
*
*/
- private Object inputObjectUsingFVD(Class clz,
+ private synchronized Object inputObjectUsingFVD(Class clz,
String repositoryID,
com.sun.org.omg.SendingContext.CodeBase sender,
int offset)
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java
--- a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Fri Jan 17 20:22:44 2014 +0000
@@ -201,7 +201,7 @@
readObjectState.endDefaultReadObject(this);
}
- public abstract void defaultReadObjectDelegate();
+ abstract void defaultReadObjectDelegate();
abstract void readFields(java.util.Map fieldToValueMap)
throws java.io.InvalidClassException, java.io.StreamCorruptedException,
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java
--- a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -47,6 +47,8 @@
import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
import com.sun.corba.se.impl.encoding.EncapsInputStream ;
+import sun.corba.EncapsInputStreamFactory;
+
/**
* This static utility class contains various utility methods for reading and
* writing CDR encapsulations.
@@ -108,8 +110,8 @@
static public InputStream getEncapsulationStream( InputStream is )
{
byte[] data = readOctets( is ) ;
- EncapsInputStream result = new EncapsInputStream( is.orb(), data,
- data.length ) ;
+ EncapsInputStream result = EncapsInputStreamFactory.newEncapsInputStream( is.orb(), data,
+ data.length ) ;
result.consumeEndian() ;
return result ;
}
diff -r b7fb35bbe70d -r 721b1070efda src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java Tue Oct 08 11:10:17 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java Fri Jan 17 20:22:44 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -49,6 +49,8 @@
import com.sun.corba.se.impl.logging.IORSystemException ;
import com.sun.corba.se.impl.encoding.EncapsInputStream ;
+import sun.corba.EncapsInputStreamFactory;
+
/** Based on the magic and scid, return the appropriate
* ObjectKeyTemplate. Expects to be called with a valid
@@ -217,7 +219,7 @@
public ObjectKey create( byte[] key )
{
OctetSeqHolder osh = new OctetSeqHolder() ;
- EncapsInputStream is = new EncapsInputStream( orb, key, key.length ) ;
+ EncapsInputStream is = EncapsInputStreamFactory.newEncapsInputStream( orb, key, key.length );
ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ;
More information about the distro-pkg-dev
mailing list