/hg/release/icedtea7-forest-2.4/corba: 30 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 16 18:41:34 UTC 2014
changeset 171d49504c82 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=171d49504c82
author: katleman
date: Fri Dec 20 18:52:51 2013 -0800
Added tag jdk7u51-b31 for changeset 0ad990211737
changeset 00401b8a35fc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=00401b8a35fc
author: katleman
date: Thu Dec 26 13:04:54 2013 -0800
Added tag jdk7u51-b30 for changeset 6563d12c48c9
changeset 62e0191837ed in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=62e0191837ed
author: asaha
date: Tue Dec 31 08:52:12 2013 -0800
Merge
changeset aabfdc799c07 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=aabfdc799c07
author: asaha
date: Mon Dec 16 12:12:21 2013 -0800
Added tag jdk7u55-b00 for changeset 55a509ccc0e4
changeset bce83c3685b1 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bce83c3685b1
author: asaha
date: Mon Dec 16 14:53:15 2013 -0800
Added tag jdk7u55-b01 for changeset aabfdc799c07
changeset 39680bab0f37 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=39680bab0f37
author: asaha
date: Mon Dec 16 18:48:24 2013 -0800
Merge
changeset 7e24d228977a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7e24d228977a
author: asaha
date: Fri Dec 20 11:45:59 2013 -0800
Merge
changeset a93f3b281a1e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a93f3b281a1e
author: asaha
date: Fri Dec 20 14:12:52 2013 -0800
Merge
changeset db2e6d87bade in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=db2e6d87bade
author: asaha
date: Fri Dec 20 21:29:31 2013 -0800
Merge
changeset bc8c237d636c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=bc8c237d636c
author: katleman
date: Tue Dec 24 14:45:46 2013 -0800
Added tag jdk7u55-b02 for changeset db2e6d87bade
changeset 02ff18f156bd in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=02ff18f156bd
author: asaha
date: Thu Dec 26 15:49:22 2013 -0800
Merge
changeset 62d437f0b627 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=62d437f0b627
author: katleman
date: Mon Jan 06 13:56:49 2014 -0800
Added tag jdk7u55-b03 for changeset 02ff18f156bd
changeset 04b7e00a5a38 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=04b7e00a5a38
author: katleman
date: Wed Jan 08 13:23:49 2014 -0800
Added tag jdk7u45-b35 for changeset fab1423e6ab8
changeset ee7d9f5d18fb in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ee7d9f5d18fb
author: asaha
date: Wed Jan 08 14:11:43 2014 -0800
Merge
changeset 6a88a170331f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6a88a170331f
author: asaha
date: Thu Jan 09 07:55:14 2014 -0800
Merge
changeset 5d781480a041 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5d781480a041
author: katleman
date: Mon Jan 13 16:14:32 2014 -0800
Added tag jdk7u55-b04 for changeset 6a88a170331f
changeset a8d27c3fc4e4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a8d27c3fc4e4
author: msheppar
date: Tue Jan 21 12:46:58 2014 +0000
8025005: Enhance CORBA initializations
Summary: restructure ORB.init() processing flow.
Reviewed-by: alanb, coffeys, skoivu
changeset af7f1808106b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=af7f1808106b
author: katleman
date: Wed Jan 22 10:06:25 2014 -0800
Added tag jdk7u55-b05 for changeset a8d27c3fc4e4
changeset 44801796d42b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=44801796d42b
author: katleman
date: Tue Jan 28 11:49:19 2014 -0800
Added tag jdk7u55-b06 for changeset af7f1808106b
changeset aa98fb8dc360 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=aa98fb8dc360
author: katleman
date: Tue Feb 04 13:11:40 2014 -0800
Added tag jdk7u55-b07 for changeset 44801796d42b
changeset 2a4842e7ca0b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2a4842e7ca0b
author: katleman
date: Tue Feb 11 13:11:02 2014 -0800
Added tag jdk7u55-b08 for changeset aa98fb8dc360
changeset 5805c3291eb3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5805c3291eb3
author: katleman
date: Tue Feb 18 12:41:09 2014 -0800
Added tag jdk7u55-b09 for changeset 2a4842e7ca0b
changeset b9dae31c56a2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b9dae31c56a2
author: katleman
date: Tue Feb 18 13:36:00 2014 -0800
Added tag jdk7u55-b09 for changeset 5805c3291eb3
changeset 0f75d8ee8dda in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0f75d8ee8dda
author: katleman
date: Tue Feb 25 12:19:34 2014 -0800
Added tag jdk7u55-b10 for changeset b9dae31c56a2
changeset cbd5b4b07e0c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cbd5b4b07e0c
author: coffeys
date: Tue Mar 04 00:45:16 2014 +0000
8035618: Four api/org_omg/CORBA TCK tests fail under plugin only
Reviewed-by: alanb, mchung
changeset 3cce2a49d18d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3cce2a49d18d
author: katleman
date: Tue Mar 04 12:01:29 2014 -0800
Added tag jdk7u55-b11 for changeset cbd5b4b07e0c
changeset 8efa6e66c13a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8efa6e66c13a
author: katleman
date: Tue Mar 11 12:59:17 2014 -0700
Added tag jdk7u55-b12 for changeset 3cce2a49d18d
changeset e041c52fe691 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e041c52fe691
author: katleman
date: Tue Mar 18 12:07:32 2014 -0700
Added tag jdk7u55-b13 for changeset 8efa6e66c13a
changeset a0bfd0e80ae0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a0bfd0e80ae0
author: katleman
date: Thu Mar 27 11:22:58 2014 -0700
Added tag jdk7u55-b30 for changeset e041c52fe691
changeset 179bc370340d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=179bc370340d
author: andrew
date: Wed Apr 16 19:41:04 2014 +0100
Merge jdk7u55-b14
diffstat:
.hgtags | 36 ++
.jcheck/conf | 2 -
make/Makefile | 2 +-
make/common/shared/Defs-java.gmk | 8 +-
make/common/shared/Platform.gmk | 9 +
src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java | 126 +++------
src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java | 19 +-
src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java | 69 ++---
src/share/classes/com/sun/corba/se/spi/orb/ORB.java | 31 +-
src/share/classes/org/omg/CORBA/ORB.java | 34 ++-
10 files changed, 181 insertions(+), 155 deletions(-)
diffs (truncated from 1034 to 500 lines):
diff -r 0ad990211737 -r 179bc370340d .hgtags
--- a/.hgtags Thu Dec 19 09:31:40 2013 -0800
+++ b/.hgtags Wed Apr 16 19:41:04 2014 +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
@@ -258,6 +265,7 @@
7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
@@ -335,6 +343,7 @@
bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
@@ -345,6 +354,7 @@
c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
@@ -359,6 +369,7 @@
b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
+5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2
504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
@@ -380,9 +391,12 @@
8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+8ed5df839fbccdb20f2718626402d28e5ea33542 icedtea-2.4.3
+468a4fe3400a2f6fd85f4e9023feb3b11e5edf1c icedtea-2.4.4
b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33
aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34
+fab1423e6ab8ecf36da8b6bf2e454156ec701e8a jdk7u45-b35
b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
@@ -397,3 +411,25 @@
a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
+3594dbde270d68920afc5ee862d10f14c2a87dc8 icedtea-2.4.5
+48ef1bb6d120dbf053f75787a40ef6faa38230f1 icedtea-2.4.6pre01
+48ef1bb6d120dbf053f75787a40ef6faa38230f1 icedtea-2.4.6
+e6ad5b912691cda3037a1d1c15ac6ae3624e166b icedtea-2.4.7
+6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
+0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u55-b00
+aabfdc799c0799837dcbbf9ea8d6df1511978b1f jdk7u55-b01
+db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
+02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
+6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
+a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05
+af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06
+44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07
+aa98fb8dc3608a30ac593635b21aca2105aaab20 jdk7u55-b08
+2a4842e7ca0b2228017542cea0fed3b8d4f4491a jdk7u55-b09
+5805c3291eb3a82cd75e95ac06eb13daa7f92866 jdk7u55-b09
+b9dae31c56a2bf69fc5932cc490cd80fccc1e0fd jdk7u55-b10
+cbd5b4b07e0c8a5f61eff396b7622e7b04d2a164 jdk7u55-b11
+3cce2a49d18d93dfca2634db32368486ebbb1590 jdk7u55-b12
+8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
+e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
diff -r 0ad990211737 -r 179bc370340d .jcheck/conf
--- a/.jcheck/conf Thu Dec 19 09:31:40 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 0ad990211737 -r 179bc370340d make/Makefile
--- a/make/Makefile Thu Dec 19 09:31:40 2013 -0800
+++ b/make/Makefile Wed Apr 16 19:41:04 2014 +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 0ad990211737 -r 179bc370340d make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk Thu Dec 19 09:31:40 2013 -0800
+++ b/make/common/shared/Defs-java.gmk Wed Apr 16 19:41:04 2014 +0100
@@ -79,9 +79,13 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ ifeq ($(ARCH), ppc)
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
+ else
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ endif
else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
diff -r 0ad990211737 -r 179bc370340d make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Thu Dec 19 09:31:40 2013 -0800
+++ b/make/common/shared/Platform.gmk Wed Apr 16 19:41:04 2014 +0100
@@ -153,6 +153,9 @@
OS_VERSION := $(shell uname -r)
# Arch and OS name/version
mach := $(shell uname -m)
+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+ mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
+ 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 0ad990211737 -r 179bc370340d src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
--- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Thu Dec 19 09:31:40 2013 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Wed Apr 16 19:41:04 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -52,6 +52,7 @@
import java.io.DataOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.InvalidClassException;
+import java.io.Externalizable;
import java.io.Serializable;
import java.util.Arrays;
@@ -82,15 +83,15 @@
public static final long kDefaultUID = -1;
private static Object noArgsList[] = {};
- private static Class noTypesList[] = {};
+ private static Class<?> noTypesList[] = {};
/** true if represents enum type */
private boolean isEnum;
private static final Bridge bridge =
- (Bridge)AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ AccessController.doPrivileged(
+ new PrivilegedAction<Bridge>() {
+ public Bridge run() {
return Bridge.get() ;
}
}
@@ -100,7 +101,7 @@
* is returned if the specified class does not implement
* java.io.Serializable or java.io.Externalizable.
*/
- static final ObjectStreamClass lookup(Class cl)
+ static final ObjectStreamClass lookup(Class<?> cl)
{
ObjectStreamClass desc = lookupInternal(cl);
if (desc.isSerializable() || desc.isExternalizable())
@@ -112,7 +113,7 @@
* Find the class descriptor for the specified class.
* Package access only so it can be called from ObjectIn/OutStream.
*/
- static ObjectStreamClass lookupInternal(Class cl)
+ static ObjectStreamClass lookupInternal(Class<?> cl)
{
/* Synchronize on the hashtable so no two threads will do
* this at the same time.
@@ -123,14 +124,14 @@
desc = findDescriptorFor(cl);
if (desc == null) {
/* Check if it's serializable */
- boolean serializable = classSerializable.isAssignableFrom(cl);
+ boolean serializable = Serializable.class.isAssignableFrom(cl);
/* If the class is only Serializable,
* lookup the descriptor for the superclass.
*/
ObjectStreamClass superdesc = null;
if (serializable) {
- Class superclass = cl.getSuperclass();
+ Class<?> superclass = cl.getSuperclass();
if (superclass != null)
superdesc = lookup(superclass);
}
@@ -143,7 +144,7 @@
if (serializable) {
externalizable =
((superdesc != null) && superdesc.isExternalizable()) ||
- classExternalizable.isAssignableFrom(cl);
+ Externalizable.class.isAssignableFrom(cl);
if (externalizable) {
serializable = false;
}
@@ -187,7 +188,7 @@
* that have evolved from a common root class and agree to be serialized
* and deserialized using a common format.
*/
- public static final long getSerialVersionUID( java.lang.Class clazz) {
+ public static final long getSerialVersionUID( java.lang.Class<?> clazz) {
ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
if( theosc != null )
{
@@ -221,7 +222,7 @@
/**
* Return the actual (computed) serialVersionUID for this class.
*/
- public static final long getActualSerialVersionUID( java.lang.Class clazz )
+ public static final long getActualSerialVersionUID( java.lang.Class<?> clazz )
{
ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
if( theosc != null )
@@ -251,7 +252,7 @@
* Return the class in the local VM that this version is mapped to.
* Null is returned if there is no corresponding local class.
*/
- public final Class forClass() {
+ public final Class<?> forClass() {
return ofClass;
}
@@ -351,7 +352,7 @@
* Create a new ObjectStreamClass from a loaded class.
* Don't call this directly, call lookup instead.
*/
- private ObjectStreamClass(java.lang.Class cl, ObjectStreamClass superdesc,
+ private ObjectStreamClass(java.lang.Class<?> cl, ObjectStreamClass superdesc,
boolean serial, boolean extern)
{
ofClass = cl; /* created from this class */
@@ -390,7 +391,7 @@
PersistentFieldsValue() { }
- ObjectStreamField[] get(Class type) {
+ ObjectStreamField[] get(Class<?> type) {
Object value = map.get(type);
if (value == null) {
value = computeValue(type);
@@ -448,7 +449,7 @@
if (initialized)
return;
- final Class cl = ofClass;
+ final Class<?> cl = ofClass;
if (!serializable ||
externalizable ||
@@ -576,9 +577,9 @@
* will call it as necessary.
*/
writeObjectMethod = getPrivateMethod( cl, "writeObject",
- new Class[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
+ new Class<?>[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
readObjectMethod = getPrivateMethod( cl, "readObject",
- new Class[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
+ new Class<?>[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
}
return null;
}
@@ -604,9 +605,9 @@
* class, or null if none found. Access checks are disabled on the
* returned method (if any).
*/
- private static Method getPrivateMethod(Class cl, String name,
- Class[] argTypes,
- Class returnType)
+ private static Method getPrivateMethod(Class<?> cl, String name,
+ Class<?>[] argTypes,
+ Class<?> returnType)
{
try {
Method meth = cl.getDeclaredMethod(name, argTypes);
@@ -667,7 +668,7 @@
* Fill in the reflected Fields that will be used
* for reading.
*/
- final void setClass(Class cl) throws InvalidClassException {
+ final void setClass(Class<?> cl) throws InvalidClassException {
if (cl == null) {
localClassDesc = null;
@@ -934,9 +935,9 @@
* Access checks are disabled on the returned constructor (if any), since
* the defining class may still be non-public.
*/
- private static Constructor getExternalizableConstructor(Class cl) {
+ private static Constructor getExternalizableConstructor(Class<?> cl) {
try {
- Constructor cons = cl.getDeclaredConstructor(new Class[0]);
+ Constructor cons = cl.getDeclaredConstructor(new Class<?>[0]);
cons.setAccessible(true);
return ((cons.getModifiers() & Modifier.PUBLIC) != 0) ?
cons : null;
@@ -950,15 +951,15 @@
* superclass, or null if none found. Access checks are disabled on the
* returned constructor (if any).
*/
- private static Constructor getSerializableConstructor(Class cl) {
- Class initCl = cl;
+ private static Constructor getSerializableConstructor(Class<?> cl) {
+ Class<?> initCl = cl;
while (Serializable.class.isAssignableFrom(initCl)) {
if ((initCl = initCl.getSuperclass()) == null) {
return null;
}
}
try {
- Constructor cons = initCl.getDeclaredConstructor(new Class[0]);
+ Constructor cons = initCl.getDeclaredConstructor(new Class<?>[0]);
int mods = cons.getModifiers();
if ((mods & Modifier.PRIVATE) != 0 ||
((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 &&
@@ -1063,7 +1064,7 @@
* items to the hash accumulating in the digest stream.
* Fold the hash into a long. Use the SHA secure hash function.
*/
- private static long _computeSerialVersionUID(Class cl) {
+ private static long _computeSerialVersionUID(Class<?> cl) {
if (DEBUG_SVUID)
msg( "Computing SerialVersionUID for " + cl ) ;
ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
@@ -1117,7 +1118,7 @@
* them from its computation.
*/
- Class interfaces[] = cl.getInterfaces();
+ Class<?> interfaces[] = cl.getInterfaces();
Arrays.sort(interfaces, compareClassByName);
for (int i = 0; i < interfaces.length; i++) {
@@ -1247,7 +1248,7 @@
return h;
}
- private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class cl) {
+ private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class<?> cl) {
ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
long h = 0;
@@ -1267,7 +1268,7 @@
DataOutputStream data = new DataOutputStream(mdo);
// Get SUID of parent
- Class parent = cl.getSuperclass();
+ Class<?> parent = cl.getSuperclass();
if ((parent != null))
// SerialBug 1; acc. to spec the one for
// java.lang.object
@@ -1323,10 +1324,10 @@
/**
* Compute the JVM signature for the class.
*/
- static String getSignature(Class clazz) {
+ static String getSignature(Class<?> clazz) {
String type = null;
if (clazz.isArray()) {
- Class cl = clazz;
+ Class<?> cl = clazz;
int dimensions = 0;
while (cl.isArray()) {
dimensions++;
@@ -1372,7 +1373,7 @@
sb.append("(");
- Class[] params = meth.getParameterTypes(); // avoid clone
+ Class<?>[] params = meth.getParameterTypes(); // avoid clone
for (int j = 0; j < params.length; j++) {
sb.append(getSignature(params[j]));
}
@@ -1389,7 +1390,7 @@
sb.append("(");
- Class[] params = cons.getParameterTypes(); // avoid clone
+ Class<?>[] params = cons.getParameterTypes(); // avoid clone
for (int j = 0; j < params.length; j++) {
sb.append(getSignature(params[j]));
}
@@ -1409,7 +1410,7 @@
* The entries are extended from java.lang.ref.SoftReference so the
* gc will be able to free them if needed.
*/
- private static ObjectStreamClass findDescriptorFor(Class cl) {
+ private static ObjectStreamClass findDescriptorFor(Class<?> cl) {
int hash = cl.hashCode();
int index = (hash & 0x7FFFFFFF) % descriptorFor.length;
@@ -1456,7 +1457,7 @@
descriptorFor[index] = e;
}
- private static Field[] getDeclaredFields(final Class clz) {
+ private static Field[] getDeclaredFields(final Class<?> clz) {
return (Field[]) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
return clz.getDeclaredFields();
@@ -1490,7 +1491,7 @@
/*
* Class that is a descriptor for in this virtual machine.
*/
- private Class ofClass;
+ private Class<?> ofClass;
/*
* True if descriptor for a proxy class.
@@ -1562,30 +1563,17 @@
* Returns true if the given class defines a static initializer method,
* false otherwise.
*/
- private static boolean hasStaticInitializer(Class cl) {
More information about the distro-pkg-dev
mailing list