/hg/release/icedtea7-forest-2.4/corba: 48 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 1 18:28:52 PDT 2013
changeset 1d66cb844403 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1d66cb844403
author: katleman
date: Wed Apr 17 12:13:22 2013 -0700
Added tag jdk7u14-b21 for changeset fb590ca4de9a
changeset e5d89aa2c1a1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e5d89aa2c1a1
author: lana
date: Thu Apr 18 14:31:09 2013 -0700
Merge
changeset d85df1552f87 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d85df1552f87
author: katleman
date: Wed Apr 24 12:20:36 2013 -0700
Added tag jdk7u14-b22 for changeset e5d89aa2c1a1
changeset 3c41beaa95f5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3c41beaa95f5
author: katleman
date: Wed May 01 14:50:34 2013 -0700
Added tag jdk7u40-b23 for changeset d85df1552f87
changeset 583e454e0813 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=583e454e0813
author: dmeetry
date: Mon Apr 29 16:44:32 2013 +0400
4504275: CORBA boolean type unions do not generate compilable code from idlj
Summary: JLS doesn't allow boolean type in switch statement, hence substituted by if statement.
Reviewed-by: lancea
changeset 2f38ced3bea8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2f38ced3bea8
author: dmeetry
date: Mon Apr 29 16:51:32 2013 +0400
8011986: [corba] idlj generates read/write union helper methods that throw wrong exception in some cases
Reviewed-by: lancea
changeset d3ab3b19caa0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d3ab3b19caa0
author: lana
date: Mon May 06 09:54:13 2013 -0700
Merge
changeset abfc54516d0b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=abfc54516d0b
author: katleman
date: Wed May 08 16:51:42 2013 -0700
Added tag jdk7u40-b24 for changeset d3ab3b19caa0
changeset be9099c54a35 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=be9099c54a35
author: katleman
date: Thu May 16 12:13:53 2013 -0700
Added tag jdk7u40-b25 for changeset abfc54516d0b
changeset f745eeabb0ea in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f745eeabb0ea
author: katleman
date: Wed May 22 16:01:47 2013 -0700
Added tag jdk7u40-b26 for changeset be9099c54a35
changeset c8b9201f88f4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c8b9201f88f4
author: katleman
date: Wed May 29 13:24:20 2013 -0700
Added tag jdk7u40-b27 for changeset f745eeabb0ea
changeset 1ad0a5a3f7b1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1ad0a5a3f7b1
author: katleman
date: Wed Jun 05 17:46:39 2013 -0700
Added tag jdk7u40-b28 for changeset c8b9201f88f4
changeset b9a72e58773c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b9a72e58773c
author: katleman
date: Wed Jun 12 19:58:16 2013 -0700
Added tag jdk7u40-b29 for changeset 1ad0a5a3f7b1
changeset cdbafc5080ee in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cdbafc5080ee
author: katleman
date: Tue Mar 12 14:45:06 2013 -0700
Added tag jdk7u25-b01 for changeset 3d0f2d5b1866
changeset 9fcb409310d7 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9fcb409310d7
author: katleman
date: Tue Mar 19 14:31:19 2013 -0700
Added tag jdk7u25-b02 for changeset cdbafc5080ee
changeset 2057de7ee6b1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2057de7ee6b1
author: coffeys
date: Thu Mar 21 22:29:15 2013 +0000
Merge
changeset b180f1282ad2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b180f1282ad2
author: katleman
date: Tue Mar 26 14:17:32 2013 -0700
Added tag jdk7u25-b03 for changeset 2057de7ee6b1
changeset 3ad05f13c4e8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3ad05f13c4e8
author: katleman
date: Tue Apr 02 12:11:58 2013 -0700
Added tag jdk7u25-b04 for changeset b180f1282ad2
changeset 262eade94753 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=262eade94753
author: coffeys
date: Fri Apr 05 21:33:35 2013 +0100
Merge
changeset ffa99209b6e3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ffa99209b6e3
author: coffeys
date: Mon Apr 08 23:12:03 2013 +0100
8001032: Restrict object access
Summary: Restrict object access; fix reviewed also by Alexander Fomin
Reviewed-by: alanb, ahgross
changeset a9ded0d825eb in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a9ded0d825eb
author: katleman
date: Mon Mar 04 14:17:09 2013 -0800
Added tag jdk7u17-b32 for changeset 6401c6b99d2d
changeset 2c8f00e59653 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2c8f00e59653
author: asaha
date: Mon Apr 08 15:40:58 2013 -0700
Merge
changeset d97e6c162735 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d97e6c162735
author: asaha
date: Mon Apr 08 16:25:34 2013 -0700
Merge
changeset da9301dac56c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=da9301dac56c
author: katleman
date: Wed Apr 10 12:42:43 2013 -0700
Added tag jdk7u25-b05 for changeset d97e6c162735
changeset aa2dc8d3bb2c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=aa2dc8d3bb2c
author: katleman
date: Tue Apr 16 11:27:52 2013 -0700
Added tag jdk7u25-b06 for changeset da9301dac56c
changeset 550d43da7fe2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=550d43da7fe2
author: katleman
date: Thu Apr 18 11:44:14 2013 -0700
Added tag jdk7u25-b07 for changeset aa2dc8d3bb2c
changeset e7d599f87ef1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e7d599f87ef1
author: katleman
date: Tue Apr 23 16:20:03 2013 -0700
Added tag jdk7u25-b08 for changeset 550d43da7fe2
changeset 161ec4dd450d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=161ec4dd450d
author: coffeys
date: Fri Apr 26 18:26:12 2013 +0100
8000642: Better handling of objects for transportation
Summary: Also reviewed by alexander.fomin
Reviewed-by: alanb, mchung, skoivu
changeset c9da98e82bb0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c9da98e82bb0
author: katleman
date: Tue Apr 30 12:25:01 2013 -0700
Added tag jdk7u25-b09 for changeset 161ec4dd450d
changeset 109386df5b8e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=109386df5b8e
author: katleman
date: Tue May 07 12:56:10 2013 -0700
Added tag jdk7u25-b10 for changeset c9da98e82bb0
changeset ef8e6f8305d5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ef8e6f8305d5
author: katleman
date: Wed May 15 13:30:36 2013 -0700
Added tag jdk7u25-b11 for changeset 109386df5b8e
changeset 6e5480f1679c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6e5480f1679c
author: asaha
date: Wed May 15 14:17:56 2013 -0700
Merge
changeset bcc7deed397b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bcc7deed397b
author: asaha
date: Wed May 22 11:57:17 2013 -0700
Merge
changeset 96ab87e8a596 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=96ab87e8a596
author: asaha
date: Wed Jun 12 08:57:25 2013 -0700
Merge
changeset 651dcadbd977 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=651dcadbd977
author: asaha
date: Thu Jun 13 17:35:56 2013 -0700
Merge
changeset c5b5886004e6 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c5b5886004e6
author: katleman
date: Fri Jun 21 11:18:31 2013 -0700
Added tag jdk7u40-b30 for changeset 651dcadbd977
changeset eca480919c71 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eca480919c71
author: katleman
date: Wed May 22 15:44:47 2013 -0700
Added tag jdk7u25-b12 for changeset ef8e6f8305d5
changeset 577c4dd1a6e9 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=577c4dd1a6e9
author: katleman
date: Fri May 24 16:20:22 2013 -0700
Added tag jdk7u25-b13 for changeset eca480919c71
changeset 4fde7ac2ecf4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4fde7ac2ecf4
author: katleman
date: Tue Jun 04 10:47:31 2013 -0700
Added tag jdk7u25-b14 for changeset 577c4dd1a6e9
changeset f4bec833a24b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=f4bec833a24b
author: katleman
date: Thu Jun 06 11:41:28 2013 -0700
Added tag jdk7u25-b15 for changeset 4fde7ac2ecf4
changeset 65d0e39500d5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=65d0e39500d5
author: katleman
date: Tue Jun 11 11:45:11 2013 -0700
Added tag jdk7u25-b30 for changeset f4bec833a24b
changeset d77153cbe030 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d77153cbe030
author: katleman
date: Wed Jun 12 20:18:16 2013 -0700
Added tag jdk7u25-b16 for changeset 65d0e39500d5
changeset 676aa80fc554 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=676aa80fc554
author: katleman
date: Fri Jun 14 18:10:15 2013 -0700
Added tag jdk7u25-b32 for changeset d77153cbe030
changeset 6c6a69f1e394 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6c6a69f1e394
author: asaha
date: Fri Jun 21 10:51:54 2013 -0700
Merge
changeset 3d2b811b8a79 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3d2b811b8a79
author: asaha
date: Fri Jun 21 19:00:26 2013 -0700
Merge
changeset 2adeac28b7a0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2adeac28b7a0
author: andrew
date: Mon Jul 01 09:06:51 2013 -0500
Merge jdk7u40-b29
changeset 23ae4e0e0cce in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=23ae4e0e0cce
author: andrew
date: Mon Jul 01 09:21:59 2013 -0500
Merge jdk7u40-b31
changeset fa3662658634 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fa3662658634
author: andrew
date: Tue Jul 02 02:26:31 2013 +0100
Added tag icedtea-2.4.1 for changeset 23ae4e0e0cce
diffstat:
.hgtags | 61 ++++
.jcheck/conf | 2 -
make/Makefile | 2 +-
make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 3 +-
make/common/shared/Platform.gmk | 9 +
src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 12 +-
src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java | 4 +-
src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java | 8 +-
src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java | 5 +-
src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java | 18 +-
src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 8 +-
src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java | 10 +-
src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java | 2 +-
src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +-
src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +-
src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java | 3 +-
src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java | 5 +-
src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java | 8 +-
src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java | 7 +-
src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 11 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java | 4 +-
src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 22 +-
src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java | 47 ---
src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 8 +-
src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java | 22 +-
src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java | 3 +-
src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java | 8 +-
src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java | 3 +-
src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java | 3 +-
src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java | 4 +-
src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java | 4 +-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java | 8 +-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 6 +-
src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java | 5 +-
src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 6 +-
src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java | 8 +-
src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java | 5 +-
src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java | 55 ++-
src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java | 40 ++-
src/share/classes/sun/corba/JavaCorbaAccess.java | 3 +-
src/share/classes/sun/corba/OutputStreamFactory.java | 149 ++++++++++
49 files changed, 445 insertions(+), 190 deletions(-)
diffs (truncated from 1629 to 500 lines):
diff -r fb590ca4de9a -r fa3662658634 .hgtags
--- a/.hgtags Wed Apr 10 10:29:44 2013 -0700
+++ b/.hgtags Tue Jul 02 02:26:31 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
@@ -213,6 +220,8 @@
ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02
268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04
a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05
+b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31
+0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32
ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10
a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11
e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12
@@ -223,8 +232,11 @@
57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17
f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18
22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30
+2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31
e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20
dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21
+24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32
+4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33
96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03
1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04
5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05
@@ -253,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
@@ -262,10 +275,46 @@
622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01
30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02
7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30
+3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31
+f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33
e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03
b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32
94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01
e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02
+d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30
+a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31
+6401c6b99d2d43ed4f0e2d38dce496069f6e91f8 jdk7u17-b32
+f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01
+17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02
+bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03
+3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04
+f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05
+94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06
+23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07
+ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08
+b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09
+b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
+61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
+3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
+fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
+3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
+cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
+2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
+b180f1282ad221bde0d4d865c879c0fa7f8ef4c8 jdk7u25-b04
+d97e6c162735798fe0c9f1dd582aa1114b6c5447 jdk7u25-b05
+da9301dac56c26846212db33bb20001652b6ce60 jdk7u25-b06
+aa2dc8d3bb2cdd726ec97bc2bf130eec46467f28 jdk7u25-b07
+550d43da7fe2f85bbce88cc94066c589480b1221 jdk7u25-b08
+161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
+c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
+109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
+ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
+eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
+577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
+4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15
+f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30
+65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16
+d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32
38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
@@ -273,3 +322,15 @@
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
diff -r fb590ca4de9a -r fa3662658634 .jcheck/conf
--- a/.jcheck/conf Wed Apr 10 10:29:44 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r fb590ca4de9a -r fa3662658634 make/Makefile
--- a/make/Makefile Wed Apr 10 10:29:44 2013 -0700
+++ b/make/Makefile Tue Jul 02 02:26:31 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 fb590ca4de9a -r fa3662658634 make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Wed Apr 10 10:29:44 2013 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2012, 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
@@ -39,7 +39,6 @@
com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \
com/sun/corba/se/impl/orbutil/ORBConstants.java \
com/sun/corba/se/impl/orbutil/ORBUtility.java \
- com/sun/corba/se/impl/orbutil/ORBClassLoader.java \
com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
diff -r fb590ca4de9a -r fa3662658634 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Wed Apr 10 10:29:44 2013 -0700
+++ b/make/common/shared/Platform.gmk Tue Jul 02 02:26:31 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_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed '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 fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -81,7 +81,6 @@
import com.sun.corba.se.impl.oa.poa.BadServerIdHandler;
import com.sun.corba.se.impl.orbutil.ORBConstants;
-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
import com.sun.corba.se.impl.orbutil.ORBUtility;
import com.sun.corba.se.impl.util.Utility;
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -33,6 +33,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.List ;
import java.util.ArrayList ;
@@ -504,7 +506,13 @@
public org.omg.CORBA.portable.OutputStream create_output_stream()
{
//debug.log ("create_output_stream");
- return new AnyOutputStream(orb);
+ final ORB finalorb = this.orb;
+ return AccessController.doPrivileged(new PrivilegedAction<AnyOutputStream>() {
+ @Override
+ public AnyOutputStream run() {
+ return new AnyOutputStream(finalorb);
+ }
+ });
}
/**
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -600,7 +600,8 @@
}
public static CDROutputStream newOutputStream(ORB orb) {
- TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb);
+ TypeCodeOutputStream tcos =
+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb);
//if (debug) System.out.println("Created TypeCodeOutputStream " + tcos +
// " with no parent");
return tcos;
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 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
@@ -66,7 +66,7 @@
*
* @author Ram Jeyaraman
*/
-public class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
+final class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
private ORB orb;
private byte encodingVersion;
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Tue Jul 02 02:26:31 2013 +0100
@@ -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
@@ -196,7 +196,8 @@
}
public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) {
- TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian());
+ TypeCodeOutputStream encap =
+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian());
encap.setEnclosingOutputStream(this);
encap.makeEncapsulation();
//if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this);
@@ -211,7 +212,8 @@
public static TypeCodeOutputStream wrapOutputStream(OutputStream os) {
boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false);
- TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian);
+ TypeCodeOutputStream tos =
+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian);
tos.setEnclosingOutputStream(os);
//if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os);
return tos;
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Tue Jul 02 02:26:31 2013 +0100
@@ -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
@@ -155,7 +155,8 @@
// be versioned. This can be handled once this work is complete.
// Create output stream with default endianness.
- EncapsOutputStream cdrOut = new EncapsOutputStream(
+ EncapsOutputStream cdrOut =
+ sun.corba.OutputStreamFactory.newEncapsOutputStream(
(com.sun.corba.se.spi.orb.ORB)orb, giopVersion );
// This is an encapsulation, so put out the endian:
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, 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
@@ -77,7 +77,6 @@
import com.sun.corba.se.impl.logging.ORBUtilSystemException;
import com.sun.corba.se.impl.logging.OMGSystemException;
import com.sun.corba.se.impl.corba.RequestImpl;
-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
import com.sun.corba.se.impl.orbutil.ORBConstants;
import com.sun.corba.se.impl.orbutil.ORBUtility;
import com.sun.corba.se.impl.orbutil.StackImpl;
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, 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
@@ -86,13 +86,14 @@
import com.sun.corba.se.impl.encoding.EncapsOutputStream;
import com.sun.corba.se.impl.orbutil.ORBUtility;
-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
import com.sun.corba.se.impl.util.RepositoryId;
import com.sun.corba.se.impl.logging.InterceptorsSystemException;
import com.sun.corba.se.impl.logging.OMGSystemException;
+import sun.corba.SharedSecrets;
+
/**
* Implementation of the RequestInfo interface as specified in
* orbos/99-12-02 section 5.4.1.
@@ -452,7 +453,8 @@
// Find the read method on the helper class:
String helperClassName = className + "Helper";
- Class helperClass = ORBClassLoader.loadClass( helperClassName );
+ Class<?> helperClass =
+ SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName );
Class[] readParams = new Class[1];
readParams[0] = org.omg.CORBA.portable.InputStream.class;
Method readMethod = helperClass.getMethod( "read", readParams );
@@ -512,7 +514,8 @@
Class exceptionClass = userException.getClass();
String className = exceptionClass.getName();
String helperClassName = className + "Helper";
- Class helperClass = ORBClassLoader.loadClass( helperClassName );
+ Class<?> helperClass =
+ SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName );
// Find insert( Any, class ) method
Class[] insertMethodParams = new Class[2];
@@ -656,7 +659,8 @@
// Convert the "core" service context to an
// "IOP" ServiceContext by writing it to a
// CDROutputStream and reading it back.
- EncapsOutputStream out = new EncapsOutputStream(myORB);
+ EncapsOutputStream out =
+ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
context.write( out, GIOPVersion.V1_2 );
InputStream inputStream = out.create_input_stream();
@@ -692,8 +696,8 @@
{
int id = 0 ;
// Convert IOP.service_context to core.ServiceContext:
- EncapsOutputStream outputStream = new EncapsOutputStream(
- myORB );
+ EncapsOutputStream outputStream =
+ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
InputStream inputStream = null;
UnknownServiceContext coreServiceContext = null;
ServiceContextHelper.write( outputStream, service_context );
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Jul 02 02:26:31 2013 +0100
@@ -300,11 +300,11 @@
resetStream();
}
- public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
+ final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
orbStream = os;
}
- public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
+ final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
return orbStream;
}
@@ -327,11 +327,11 @@
return (javax.rmi.CORBA.ValueHandler) vhandler;
}
- public final void increaseRecursionDepth(){
+ final void increaseRecursionDepth(){
recursionDepth++;
}
- public final int decreaseRecursionDepth(){
+ final int decreaseRecursionDepth(){
return --recursionDepth;
}
diff -r fb590ca4de9a -r fa3662658634 src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Wed Apr 10 10:29:44 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Tue Jul 02 02:26:31 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2004, 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
@@ -124,19 +124,19 @@
}
}
- public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
+ final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
orbStream = os;
}
- public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
+ final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
return orbStream;
}
More information about the distro-pkg-dev
mailing list