/hg/release/icedtea7-forest-2.4/corba: 21 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 14 01:00:47 PST 2013
changeset dff0f0272891 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=dff0f0272891
author: katleman
date: Fri Jan 11 09:00:00 2013 -0800
Added tag jdk7u11-b20 for changeset e7952daece16
changeset 1e0237992c95 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1e0237992c95
author: katleman
date: Sat Jan 12 14:42:50 2013 -0800
Added tag jdk7u11-b21 for changeset dff0f0272891
changeset e2f2577fb647 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e2f2577fb647
author: coffeys
date: Tue Oct 30 17:06:35 2012 +0000
8000631: Restrict access to class constructor
Reviewed-by: alanb, ahgross
changeset 552bece6cbc4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=552bece6cbc4
author: ngmr
date: Tue Oct 30 17:15:13 2012 +0000
8000540: Improve IIOP type reuse management
Reviewed-by: alanb, ahgross, coffeys
changeset 961816ee4c90 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=961816ee4c90
author: coffeys
date: Wed Oct 31 20:31:52 2012 +0000
8002068: Build broken: corba code changes unable to use new JDK 7 classes
Reviewed-by: alanb, ahgross
changeset 9f409dc9bb6b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9f409dc9bb6b
author: coffeys
date: Tue Nov 06 15:50:14 2012 +0000
7201066: Change modifiers on unused fields
Reviewed-by: alanb, skoivu
changeset 96a3c68e5741 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=96a3c68e5741
author: mbankal
date: Fri Nov 09 10:20:16 2012 -0800
7141694: Improving CORBA internals
Reviewed-by: coffeys, ahgross
changeset 1413b173730f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1413b173730f
author: katleman
date: Tue Nov 13 16:57:22 2012 -0800
Added tag jdk7u11-b03 for changeset 96a3c68e5741
changeset 46d5bdd6a0bc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=46d5bdd6a0bc
author: ewendeli
date: Thu Nov 15 14:01:59 2012 +0100
Merge
changeset 7cb070bd0bc4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7cb070bd0bc4
author: ewendeli
date: Mon Nov 19 16:26:32 2012 +0100
Merge
changeset 5c49a17bc15f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5c49a17bc15f
author: cl
date: Tue Nov 20 18:12:09 2012 -0800
Added tag jdk7u11-b04 for changeset 1413b173730f
changeset eed8f33bc6be in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eed8f33bc6be
author: cl
date: Tue Nov 20 18:31:14 2012 -0800
Added tag jdk7u11-b05 for changeset 5c49a17bc15f
changeset 30057c20fbb3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=30057c20fbb3
author: ewendeli
date: Thu Nov 22 08:18:54 2012 +0100
Merge
changeset 6c3097aa46c2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6c3097aa46c2
author: katleman
date: Wed Nov 28 15:41:29 2012 -0800
Added tag jdk7u11-b06 for changeset 30057c20fbb3
changeset 9d9440d1fa2d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9d9440d1fa2d
author: ewendeli
date: Fri Nov 30 04:54:33 2012 +0100
Merge
changeset 9d37e2479b14 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9d37e2479b14
author: katleman
date: Tue Dec 04 10:39:05 2012 -0800
Added tag jdk7u11-b07 for changeset 9d9440d1fa2d
changeset 983fac5b2737 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=983fac5b2737
author: ewendeli
date: Thu Dec 06 17:41:20 2012 +0100
Merge
changeset 16fa5d7ede1e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=16fa5d7ede1e
author: katleman
date: Tue Dec 11 12:13:54 2012 -0800
Added tag jdk7u11-b08 for changeset 983fac5b2737
changeset b192d1487319 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b192d1487319
author: ewendeli
date: Mon Jan 14 18:31:43 2013 +0100
Merge
changeset b9ab9b203a41 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b9ab9b203a41
author: katleman
date: Tue Jan 15 18:57:12 2013 -0800
Added tag jdk7u13-b09 for changeset b192d1487319
changeset 560597a06268 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=560597a06268
author: andrew
date: Thu Feb 14 02:27:23 2013 +0000
Merge jdk7u13-b20
diffstat:
.hgtags | 36 +
make/Makefile | 2 +-
make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk | 14 +-
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/corba/AnyImpl.java | 6 +-
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/io/FVDCodeBaseImpl.java | 8 +-
src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java | 130 +-
src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java | 85 +-
src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java | 10 +-
src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 6 +-
src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java | 2 +-
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/ORBUtility.java | 38 +-
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/transport/CorbaResponseWaitingRoomImpl.java | 73 +-
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java | 5 +-
src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 37 +-
src/share/classes/sun/corba/JavaCorbaAccess.java | 32 +
src/share/classes/sun/corba/SharedSecrets.java | 60 +
34 files changed, 326 insertions(+), 3567 deletions(-)
diffs (truncated from 4575 to 500 lines):
diff -r e7952daece16 -r 560597a06268 .hgtags
--- a/.hgtags Tue Dec 04 17:28:13 2012 -0800
+++ b/.hgtags Thu Feb 14 02:27:23 2013 +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
@@ -199,6 +206,7 @@
2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23
02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24
8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30
+d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u6-b31
d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10
496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30
e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11
@@ -222,3 +230,31 @@
57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17
f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18
22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30
+353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01
+d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02
+7c62cfa17e9613bf69d4f9b2ae74f3724d7a2955 jdk7u8-b03
+86961c802e87688ff264a946ca647d062f538302 jdk7u8-b04
+a274cd0c309b4da766dc73cac644cb44f1c23787 jdk7u8-b05
+292eab1079e7b62db7cf848781eddf1b6fc718e5 jdk7u10-b06
+ff5e33bcfc2bb7c2a69cd20b91490922eb158af2 jdk7u10-b07
+76811225baeccd3ed77a3e2ec7745ba3d42acff5 jdk7u10-b08
+f8e8ef8e0a5eea83938dab38d9a8cf6354f5a92d jdk7u10-b09
+3f309ff1d8ecd0210340ae9cfb40cc9072f66757 jdk7u12-b01
+06a04d95a12f18f07610f5d787324e2ea15e6376 jdk7u12-b02
+665ee21ff3ef309147e7f7872e2d4f446a31b642 jdk7u12-b03
+f89f101d3dfea98b143b693cebccdefc89b691ff jdk7u12-b04
+2516fd4adf4af010c217e073cdb0a1fa9eefd827 jdk7u12-b05
+16287175b517e48da9b24d31a3e9da200b6bc563 jdk7u12-b06
+7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
+6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
+c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
+e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20
+dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21
+96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03
+1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04
+5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05
+30057c20fbb3caa61857656d05421e56731184f2 jdk7u11-b06
+9d9440d1fa2dd872c2a2b564fc5fa4d3555afab6 jdk7u11-b07
+983fac5b27376839142ac5a8770461e4e48c2dc8 jdk7u11-b08
+b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u13-b09
diff -r e7952daece16 -r 560597a06268 make/Makefile
--- a/make/Makefile Tue Dec 04 17:28:13 2012 -0800
+++ b/make/Makefile Thu Feb 14 02:27:23 2013 +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)
diff -r e7952daece16 -r 560597a06268 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 Tue Dec 04 17:28:13 2012 -0800
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Thu Feb 14 02:27:23 2013 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -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 \
@@ -45,19 +41,11 @@
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 e7952daece16 -r 560597a06268 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Tue Dec 04 17:28:13 2012 -0800
+++ b/make/common/shared/Platform.gmk Thu Feb 14 02:27:23 2013 +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_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 e7952daece16 -r 560597a06268 src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
--- a/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java Thu Feb 14 02:27:23 2013 +0000
@@ -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 e7952daece16 -r 560597a06268 src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Feb 14 02:27:23 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, 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
@@ -1218,7 +1218,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 +1251,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 e7952daece16 -r 560597a06268 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 Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Thu Feb 14 02:27:23 2013 +0000
@@ -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 e7952daece16 -r 560597a06268 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 Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Thu Feb 14 02:27:23 2013 +0000
@@ -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) {
if (valueHandler == null)
- valueHandler = ORBUtility.createValueHandler(orb); //d11638
+ valueHandler = ORBUtility.createValueHandler(); //d11638
// Write value_tag
int indirection = writeValueTag(mustChunk, true,
@@ -768,7 +758,7 @@
private void writeRMIIIOPValueType(Serializable object, Class clazz) {
if (valueHandler == null)
- valueHandler = ORBUtility.createValueHandler(orb); //d11638
+ valueHandler = ORBUtility.createValueHandler(); //d11638
Serializable key = object;
diff -r e7952daece16 -r 560597a06268 src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java Thu Feb 14 02:27:23 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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,7 +86,7 @@
// default to using the current ORB version in case the
// vhandler is not set
if (vhandler == null) {
- vhandler = new ValueHandlerImpl(false);
+ vhandler = ValueHandlerImpl.getInstance(false);
}
// Util.getCodebase may return null which would
@@ -120,7 +120,7 @@
// default to using the current ORB version in case the
// vhandler is not set
if (vhandler == null) {
- vhandler = new ValueHandlerImpl(false);
+ vhandler = ValueHandlerImpl.getInstance(false);
}
try{
@@ -161,7 +161,7 @@
// default to using the current ORB version in case the
// vhandler is not set
if (vhandler == null) {
- vhandler = new ValueHandlerImpl(false);
+ vhandler = ValueHandlerImpl.getInstance(false);
}
Stack repIds = new Stack();
diff -r e7952daece16 -r 560597a06268 src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
--- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Tue Dec 04 17:28:13 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Thu Feb 14 02:27:23 2013 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
/*
* Licensed Materials - Property of IBM
* RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999 All Rights Reserved
+ * Copyright IBM Corp. 1998 2012 All Rights Reserved
*
*/
@@ -56,7 +56,8 @@
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.sun.corba.se.impl.util.RepositoryId;
@@ -83,8 +84,6 @@
private static Object noArgsList[] = {};
private static Class noTypesList[] = {};
- private static Hashtable translatedFields;
-
/** true if represents enum type */
private boolean isEnum;
@@ -384,6 +383,55 @@
*/
}
+ private static final class PersistentFieldsValue {
+ private final ConcurrentMap map = new ConcurrentHashMap();
+ private static final Object NULL_VALUE =
+ (PersistentFieldsValue.class.getName() + ".NULL_VALUE");
+
+ PersistentFieldsValue() { }
+
+ ObjectStreamField[] get(Class type) {
+ Object value = map.get(type);
+ if (value == null) {
+ value = computeValue(type);
+ map.putIfAbsent(type, value);
+ }
+ return ((value == NULL_VALUE) ? null : (ObjectStreamField[])value);
+ }
+
+ private static Object computeValue(Class<?> type) {
+ try {
+ Field pf = type.getDeclaredField("serialPersistentFields");
+ int mods = pf.getModifiers();
+ if (Modifier.isPrivate(mods) && Modifier.isStatic(mods) &&
+ Modifier.isFinal(mods)) {
+ pf.setAccessible(true);
+ java.io.ObjectStreamField[] fields =
+ (java.io.ObjectStreamField[])pf.get(type);
+ return translateFields(fields);
+ }
+ } catch (NoSuchFieldException e1) {
+ } catch (IllegalAccessException e2) {
+ } catch (IllegalArgumentException e3) {
+ } catch (ClassCastException e4) { }
+ return NULL_VALUE;
+ }
+
+ private static ObjectStreamField[] translateFields(
+ java.io.ObjectStreamField[] fields) {
+ ObjectStreamField[] translation =
+ new ObjectStreamField[fields.length];
+ for (int i = 0; i < fields.length; i++) {
More information about the distro-pkg-dev
mailing list