/hg/release/icedtea7-forest-2.3/corba: 60 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 9 04:22:08 PDT 2013
changeset 2c355f17f90c in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2c355f17f90c
author: katleman
date: Fri Aug 17 11:58:02 2012 -0700
Added tag jdk7u6-b31 for changeset d7fe6c13adf9
changeset d68b4f1571b8 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d68b4f1571b8
author: asaha
date: Thu Sep 13 18:15:49 2012 -0700
Merge
changeset b426254b45bc in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b426254b45bc
author: asaha
date: Fri Oct 12 12:32:32 2012 -0700
Merge
changeset d4366e557c4c in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d4366e557c4c
author: katleman
date: Fri Mar 01 11:55:12 2013 -0800
Added tag jdk7u17-b02 for changeset e82d31e1f118
changeset 97f3860de6f3 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=97f3860de6f3
author: katleman
date: Thu Feb 07 14:19:54 2013 -0800
Added tag jdk7u21-b01 for changeset f5ef46204dba
changeset 17ecd70a2247 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=17ecd70a2247
author: ewendeli
date: Mon Feb 11 21:06:19 2013 +0100
Merge
changeset bf0877613aeb in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=bf0877613aeb
author: katleman
date: Thu Feb 14 14:10:51 2013 -0800
Added tag jdk7u21-b02 for changeset 17ecd70a2247
changeset 3e39240d7314 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3e39240d7314
author: katleman
date: Tue Feb 19 17:13:17 2013 -0800
Added tag jdk7u21-b03 for changeset bf0877613aeb
changeset 3d0f2d5b1866 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3d0f2d5b1866
author: katleman
date: Tue Feb 26 12:44:53 2013 -0800
Added tag jdk7u21-b04 for changeset 3e39240d7314
changeset 0fa70374aa25 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=0fa70374aa25
author: katleman
date: Tue Oct 16 14:54:24 2012 -0700
Added tag jdk7u9-b31 for changeset b426254b45bc
changeset afa47e72c532 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=afa47e72c532
author: katleman
date: Wed Oct 31 10:10:26 2012 -0700
Added tag jdk7u9-b32 for changeset 0fa70374aa25
changeset caba1031dc5d in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=caba1031dc5d
author: asaha
date: Tue Dec 04 11:39:27 2012 -0800
Merge
changeset 2723612f5983 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2723612f5983
author: asaha
date: Wed Dec 05 15:22:56 2012 -0800
Merge
changeset b3288e910e58 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b3288e910e58
author: katleman
date: Fri Dec 07 08:19:01 2012 -0800
Added tag jdk7u10-b31 for changeset 2723612f5983
changeset 24f8cb8a0a61 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=24f8cb8a0a61
author: ewendeli
date: Tue Jan 15 08:21:17 2013 +0100
Merge
changeset 4bfef14df261 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=4bfef14df261
author: katleman
date: Wed Jan 16 13:57:00 2013 -0800
Added tag jdk7u11-b32 for changeset 24f8cb8a0a61
changeset c13469259b39 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c13469259b39
author: katleman
date: Tue Jan 29 14:10:19 2013 -0800
Added tag jdk7u11-b33 for changeset 4bfef14df261
changeset 77c765b54496 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=77c765b54496
author: asaha
date: Fri Feb 08 19:10:07 2013 -0800
Merge
changeset 3714b558333e in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3714b558333e
author: asaha
date: Mon Feb 11 11:13:47 2013 -0800
Merge
changeset 8d524ccfc97b in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8d524ccfc97b
author: katleman
date: Tue Feb 12 12:32:33 2013 -0800
Added tag jdk7u15-b31 for changeset 3714b558333e
changeset f0c038610b6d in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f0c038610b6d
author: asaha
date: Thu Feb 14 13:17:38 2013 -0800
Merge
changeset ddf597f14512 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ddf597f14512
author: katleman
date: Tue Feb 19 12:02:52 2013 -0800
Added tag jdk7u15-b33 for changeset f0c038610b6d
changeset 8d1452e09015 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8d1452e09015
author: asaha
date: Fri Mar 01 16:06:21 2013 -0800
Merge
changeset a287afb78f76 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a287afb78f76
author: cl
date: Sat Mar 02 09:47:27 2013 -0800
Added tag jdk7u17-b30 for changeset d4366e557c4c
changeset a6f066dd2cd5 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a6f066dd2cd5
author: asaha
date: Sat Mar 02 14:33:57 2013 -0800
Merge
changeset 6401c6b99d2d in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=6401c6b99d2d
author: cl
date: Sat Mar 02 18:54:04 2013 -0800
Added tag jdk7u17-b31 for changeset a6f066dd2cd5
changeset f5a291dc9d21 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f5a291dc9d21
author: asaha
date: Mon Mar 04 10:18:46 2013 -0800
Merge
changeset 94f2ebfccc5e in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=94f2ebfccc5e
author: katleman
date: Tue Mar 05 16:45:12 2013 -0800
Added tag jdk7u21-b05 for changeset f5a291dc9d21
changeset 23a57aceeb69 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=23a57aceeb69
author: katleman
date: Tue Mar 12 14:44:01 2013 -0700
Added tag jdk7u21-b06 for changeset 94f2ebfccc5e
changeset ebedf04bfffe in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ebedf04bfffe
author: katleman
date: Tue Mar 19 14:33:23 2013 -0700
Added tag jdk7u21-b07 for changeset 23a57aceeb69
changeset b8f92ad1f0cc in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b8f92ad1f0cc
author: katleman
date: Wed Mar 20 14:47:08 2013 -0700
Added tag jdk7u21-b08 for changeset ebedf04bfffe
changeset b2adfd931a25 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b2adfd931a25
author: katleman
date: Tue Mar 26 15:00:09 2013 -0700
Added tag jdk7u21-b09 for changeset b8f92ad1f0cc
changeset 61e2e2d9cfce in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=61e2e2d9cfce
author: katleman
date: Sun Mar 31 03:46:27 2013 -0700
Added tag jdk7u21-b10 for changeset b2adfd931a25
changeset 3c774492beaa in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3c774492beaa
author: katleman
date: Thu Apr 04 15:48:01 2013 -0700
Added tag jdk7u21-b11 for changeset 61e2e2d9cfce
changeset fa2a377ce52d in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=fa2a377ce52d
author: katleman
date: Fri Apr 05 12:48:40 2013 -0700
Added tag jdk7u21-b30 for changeset 3c774492beaa
changeset 7cc2d5ba6eb2 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=7cc2d5ba6eb2
author: katleman
date: Sun Apr 07 16:34:46 2013 -0700
Added tag jdk7u21-b12 for changeset fa2a377ce52d
changeset cdbafc5080ee in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ef8e6f8305d5
author: katleman
date: Wed May 15 13:30:36 2013 -0700
Added tag jdk7u25-b11 for changeset 109386df5b8e
changeset eca480919c71 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=65d0e39500d5
author: katleman
date: Tue Jun 11 11:45:11 2013 -0700
Added tag jdk7u25-b30 for changeset f4bec833a24b
changeset ffc59f951801 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ffc59f951801
author: andrew
date: Thu Aug 08 23:15:42 2013 +0100
Merge jdk7u25-b16
diffstat:
.hgtags | 106 +
.jcheck/conf | 2 -
make/Makefile | 2 +-
make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 15 +-
make/common/shared/Platform.gmk | 9 +
src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java | 8 +-
src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java | 16 +-
src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java | 5 +-
src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java | 61 +-
src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java | 20 +-
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/FVDCodeBaseImpl.java | 8 +-
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/ObjectStreamClass.java | 130 +-
src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java | 2 +-
src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java | 85 +-
src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 18 +-
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 | 13 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java | 3 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 7 +-
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/IIOPInputStream_1_3.java | 57 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java | 54 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java | 68 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java | 66 -
src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java | 47 -
src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java | 44 +-
src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java | 6 +-
src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java | 177 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java | 177 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java | 108 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java | 102 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java | 53 +-
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java | 990 ---------
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java | 1065 ----------
src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java | 251 --
src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java | 77 -
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 | 43 +-
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/org/omg/CORBA_2_3/portable/OutputStream.java | 40 +-
src/share/classes/sun/corba/JavaCorbaAccess.java | 33 +
src/share/classes/sun/corba/OutputStreamFactory.java | 149 +
src/share/classes/sun/corba/SharedSecrets.java | 60 +
69 files changed, 682 insertions(+), 3697 deletions(-)
diffs (truncated from 5717 to 500 lines):
diff -r d7fe6c13adf9 -r ffc59f951801 .hgtags
--- a/.hgtags Mon Aug 13 14:19:45 2012 -0700
+++ b/.hgtags Thu Aug 08 23:15:42 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
@@ -199,3 +206,102 @@
2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23
02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24
8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30
+f621504b45f74a5700c26334b70303f56a49f54c icedtea-2.3
+2b1d2e9aea3270eb30e7a1ac2a02c5584acc404c icedtea-2.3.1
+e9b200124386d2dceba0f2641316e8c6499f9966 icedtea-2.3.2
+7fae6a3a68c71b9b13144e92969b8ad625cf9814 icedtea-2.3.3
+9a95d714d136b6a22bab1e8365ab3bce7a8b1ddf icedtea-2.3.4
+5116fe321210de8e227d4cde0b5e37673afee385 icedtea-2.3.5
+6d7b1e6b004a1d3704cf00d0a639d6f9e177e668 icedtea-2.3.6
+6d7b1e6b004a1d3704cf00d0a639d6f9e177e668 icedtea-2.3.6
+0000000000000000000000000000000000000000 icedtea-2.3.6
+d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u6-b31
+d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10
+496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30
+e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11
+06cbc4af754ea8f2e3b7d0b1701d1a69ce9d5075 jdk7u7-b31
+8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u7-b01
+ec602836c4e173927911673d253bb8baa1e3d170 jdk7u7-b02
+a163e56c6679d10dc64ec48f35e67c3a5942afba jdk7u9-b03
+0000000000000000000000000000000000000000 jdk7u7-b01
+8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u9-b01
+0000000000000000000000000000000000000000 jdk7u7-b02
+ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02
+268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04
+a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05
+b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31
+0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32
+ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10
+a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11
+e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12
+5cd2ef642635a7d0a79a7c28343b2ddfd0e6aa4a jdk7u10-b13
+2d53a2c7e4b989ceba356abfc8dc2129269a134f jdk7u10-b14
+c488cd628db35eb09d8ef9e10ffd00c9a93d0778 jdk7u10-b15
+64f09d7549d304fbfd3c29b4f148bf44e8e3e979 jdk7u10-b16
+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
+30057c20fbb3caa61857656d05421e56731184f2 jdk7u11-b06
+9d9440d1fa2dd872c2a2b564fc5fa4d3555afab6 jdk7u11-b07
+983fac5b27376839142ac5a8770461e4e48c2dc8 jdk7u11-b08
+b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u13-b09
+0000000000000000000000000000000000000000 icedtea-2.3.6
+329f1a69c6cfacd24290ae36780c37a6f69ecf62 icedtea-2.3.6
+97a8b625f6e95b8a2b7419fbc20682bd120f7fe2 icedtea-2.3.7
+82e58144c3fb82cdf7147f9475b9fb13a8b0d8c6 icedtea-2.3.8
+b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10
+f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30
+b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20
+622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01
+30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02
+7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30
+3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31
+f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33
+e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03
+b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32
+94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01
+47a6bf94ce11644ba0f1dc4f251f61ccd1b78c34 icedtea-2.3.9
+8e581b67151110a223a6f42a135193261a551a0d icedtea-2.3.10
+eda3895cb67e1839d712370fb6d936b844f9de72 icedtea-2.3.11
+ea108ff3be9a260a7f0e47743ea20d897de407d8 icedtea-2.3.12
+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
diff -r d7fe6c13adf9 -r ffc59f951801 .jcheck/conf
--- a/.jcheck/conf Mon Aug 13 14:19:45 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r d7fe6c13adf9 -r ffc59f951801 make/Makefile
--- a/make/Makefile Mon Aug 13 14:19:45 2012 -0700
+++ b/make/Makefile Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 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 Mon Aug 13 14:19:45 2012 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Thu Aug 08 23:15:42 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2009, 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
@@ -29,10 +29,6 @@
com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
com/sun/corba/se/impl/orbutil/HexOutputStream.java \
- com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
- com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \
- com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java \
- com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java \
com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
com/sun/corba/se/impl/orbutil/LogKeywords.java \
@@ -43,21 +39,12 @@
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/RepIdDelegator_1_3.java \
- com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java \
- com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java \
com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \
com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java \
- com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java \
com/sun/corba/se/impl/orbutil/StackImpl.java \
- com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java \
- com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java \
com/sun/corba/se/impl/orbutil/closure/Future.java \
com/sun/corba/se/impl/orbutil/closure/Constant.java \
com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
diff -r d7fe6c13adf9 -r ffc59f951801 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Mon Aug 13 14:19:45 2012 -0700
+++ b/make/common/shared/Platform.gmk Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
--- a/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Thu Aug 08 23:15:42 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -322,9 +322,9 @@
com.sun.corba.se.spi.activation._ServerImplBase
{
private ORB orb;
- private Method installMethod ;
- private Method uninstallMethod ;
- private Method shutdownMethod ;
+ private transient Method installMethod ;
+ private transient Method uninstallMethod ;
+ private transient Method shutdownMethod ;
private Object methodArgs[] ;
ServerCallback(ORB orb, Method installMethod, Method uninstallMethod,
diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Aug 08 23:15:42 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
@@ -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);
+ }
+ });
}
/**
@@ -1218,7 +1226,7 @@
// See bug 4391648 for more info about the tcORB in this
// case.
RepositoryIdStrings repStrs
- = RepositoryIdFactory.getRepIdStringsFactory(tcORB);
+ = RepositoryIdFactory.getRepIdStringsFactory();
// Assertion: c instanceof Serializable?
@@ -1251,7 +1259,7 @@
// Anything else
// We know that this is a TypeCodeImpl since it is our ORB
classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass(
- tcORB, c, ORBUtility.createValueHandler(tcORB));
+ tcORB, c, ORBUtility.createValueHandler());
// Intruct classTC to store its buffer
classTC.setCaching(true);
// Update the cache
diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Thu Aug 08 23:15:42 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 d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Thu Aug 08 23:15:42 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -269,8 +269,8 @@
private final void createRepositoryIdHandlers()
{
- repIdUtil = RepositoryIdFactory.getRepIdUtility(orb);
- repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(orb);
+ repIdUtil = RepositoryIdFactory.getRepIdUtility();
+ repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
}
public GIOPVersion getGIOPVersion() {
@@ -564,10 +564,7 @@
checkForNegativeLength(len);
- if (orb != null && ORBUtility.isLegacyORB((ORB)orb))
- return legacyReadString(len);
- else
- return internalReadString(len);
+ return internalReadString(len);
}
private final String internalReadString(int len) {
@@ -588,54 +585,6 @@
return new String(result, 0, getCharConverter().getNumChars());
}
- private final String legacyReadString(int len) {
-
- //
- // Workaround for ORBs which send string lengths of
- // zero to mean empty string.
- //
- //
- // IMPORTANT: Do not replace 'new String("")' with "", it may result
- // in a Serialization bug (See serialization.zerolengthstring) and
- // bug id: 4728756 for details
- if (len == 0)
- return new String("");
-
- len--;
- char[] c = new char[len];
-
- int n = 0;
- while (n < len) {
- int avail;
- int bytes;
- int wanted;
-
- avail = bbwi.buflen - bbwi.position();
- if (avail <= 0) {
- grow(1, 1);
- avail = bbwi.buflen - bbwi.position();
- }
- wanted = len - n;
- bytes = (wanted < avail) ? wanted : avail;
- // Microbenchmarks are showing a loop of ByteBuffer.get(int) being
- // faster than ByteBuffer.get(byte[], int, int).
- for (int i=0; i<bytes; i++) {
- c[n+i] = (char) (bbwi.byteBuffer.get(bbwi.position()+i) & 0xFF);
- }
- bbwi.position(bbwi.position() + bytes);
- n += bytes;
- }
-
- //
- // Skip past terminating null byte
- //
- if (bbwi.position() + 1 > bbwi.buflen)
- alignAndCheck(1, 1);
- bbwi.position(bbwi.position() + 1);
-
- return new String(c);
- }
-
public final String read_string() {
return readStringOrIndirection(false);
}
@@ -1045,7 +994,7 @@
try {
if (valueHandler == null)
- valueHandler = ORBUtility.createValueHandler(orb);
+ valueHandler = ORBUtility.createValueHandler();
value = valueHandler.readValue(parent,
indirection,
diff -r d7fe6c13adf9 -r ffc59f951801 src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java
--- a/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Mon Aug 13 14:19:45 2012 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Thu Aug 08 23:15:42 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -189,18 +189,8 @@
private final void createRepositoryIdHandlers()
{
- if (orb != null) {
- // Get the appropriate versions based on the ORB version. The
- // ORB versioning info is only in the core ORB.
- repIdUtil
- = RepositoryIdFactory.getRepIdUtility(orb);
- repIdStrs
- = RepositoryIdFactory.getRepIdStringsFactory(orb);
- } else {
- // Get the latest versions
- repIdUtil = RepositoryIdFactory.getRepIdUtility();
- repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
- }
+ repIdUtil = RepositoryIdFactory.getRepIdUtility();
+ repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
}
public BufferManagerWrite getBufferManager()
@@ -705,7 +695,7 @@
private void writeArray(Serializable array, Class clazz) {
More information about the distro-pkg-dev
mailing list