/hg/release/icedtea7-forest-2.3/corba: 57 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Feb 11 13:42:08 PST 2013
changeset 7b2ec0f7dba2 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=7b2ec0f7dba2
author: andrew
date: Mon Feb 11 19:03:58 2013 +0000
Removed tag icedtea-2.3.6
changeset 496baf62d055 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=496baf62d055
author: katleman
date: Wed Aug 29 10:34:37 2012 -0700
Added tag jdk7u7-b10 for changeset d7fe6c13adf9
changeset e57e4274a357 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e57e4274a357
author: katleman
date: Wed Aug 29 14:57:42 2012 -0700
Added tag jdk7u7-b30 for changeset 496baf62d055
changeset def7eeb941fa in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=def7eeb941fa
author: asaha
date: Tue Apr 17 14:34:49 2012 -0700
Merge
changeset e6020b6ae929 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e6020b6ae929
author: asaha
date: Thu Apr 19 09:57:55 2012 -0700
Merge
changeset db165a9b57e0 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=db165a9b57e0
author: asaha
date: Tue May 29 14:41:58 2012 -0700
Merge
changeset d53f503e2553 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=d53f503e2553
author: asaha
date: Fri Jun 01 08:40:38 2012 -0700
Merge
changeset e17b600cd9fb in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e17b600cd9fb
author: asaha
date: Fri Jun 01 10:53:17 2012 -0700
Merge
changeset 4100a788e43d in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=4100a788e43d
author: asaha
date: Fri Jun 15 11:15:34 2012 -0700
Merge
changeset 8737f43e092e in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=8737f43e092e
author: asaha
date: Sun Jun 24 21:26:11 2012 -0700
Merge
changeset b13f2cd7d487 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b13f2cd7d487
author: katleman
date: Thu Jun 28 11:52:23 2012 -0700
Added tag jdk7u7-b01 for changeset 8737f43e092e
changeset 051189f39c87 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=051189f39c87
author: asaha
date: Mon Jul 09 12:04:35 2012 -0700
Merge
changeset 18ac46d88665 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=18ac46d88665
author: asaha
date: Wed Jul 18 23:00:42 2012 -0700
Merge
changeset 6f7155f1493a in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=6f7155f1493a
author: asaha
date: Thu Aug 02 11:00:46 2012 -0700
Merge
changeset ec602836c4e1 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ec602836c4e1
author: asaha
date: Tue Aug 07 13:17:14 2012 -0700
Merge
changeset 37817d37bb07 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=37817d37bb07
author: katleman
date: Wed Aug 08 12:01:43 2012 -0700
Added tag jdk7u7-b02 for changeset ec602836c4e1
changeset 488e0f2102e3 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=488e0f2102e3
author: asaha
date: Fri Aug 10 14:12:42 2012 -0700
Merge
changeset ea48b34d4f4b in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ea48b34d4f4b
author: asaha
date: Mon Aug 13 15:08:08 2012 -0700
Merge
changeset 06cbc4af754e in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=06cbc4af754e
author: katleman
date: Fri Sep 07 12:07:33 2012 -0700
Added tag jdk7u7-b11 for changeset e57e4274a357
changeset 2be7230d59be in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2be7230d59be
author: katleman
date: Mon Sep 10 13:36:51 2012 -0700
Added tag jdk7u7-b31 for changeset 06cbc4af754e
changeset a163e56c6679 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a163e56c6679
author: asaha
date: Tue Sep 11 12:34:00 2012 -0700
Merge
changeset 60d71e79bbf2 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=60d71e79bbf2
author: katleman
date: Thu Sep 13 11:52:06 2012 -0700
Added tag jdk7u9-b03 for changeset a163e56c6679
changeset 268470f3f0d0 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=268470f3f0d0
author: asaha
date: Wed Sep 19 21:48:25 2012 -0700
7199669: Update tags in .hgtags file for CPU release rename
Reviewed-by: jcoomes
changeset a5dced409c4b in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a5dced409c4b
author: katleman
date: Thu Sep 20 14:22:12 2012 -0700
Added tag jdk7u9-b04 for changeset 268470f3f0d0
changeset ba68d4ad02c4 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ba68d4ad02c4
author: katleman
date: Tue Sep 25 14:59:59 2012 -0700
Added tag jdk7u9-b05 for changeset a5dced409c4b
changeset a738921b001a in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=a738921b001a
author: katleman
date: Wed Oct 03 17:40:49 2012 -0700
Added tag jdk7u10-b10 for changeset ba68d4ad02c4
changeset e52708ecb2c3 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e52708ecb2c3
author: katleman
date: Wed Oct 10 18:15:56 2012 -0700
Added tag jdk7u10-b11 for changeset a738921b001a
changeset 5cd2ef642635 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=5cd2ef642635
author: katleman
date: Wed Oct 17 15:44:01 2012 -0700
Added tag jdk7u10-b12 for changeset e52708ecb2c3
changeset 2d53a2c7e4b9 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=2d53a2c7e4b9
author: katleman
date: Wed Oct 24 12:52:29 2012 -0700
Added tag jdk7u10-b13 for changeset 5cd2ef642635
changeset c488cd628db3 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c488cd628db3
author: katleman
date: Wed Oct 31 16:47:47 2012 -0700
Added tag jdk7u10-b14 for changeset 2d53a2c7e4b9
changeset 64f09d7549d3 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=64f09d7549d3
author: katleman
date: Wed Nov 07 17:45:10 2012 -0800
Added tag jdk7u10-b15 for changeset c488cd628db3
changeset 57c3355153d1 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=57c3355153d1
author: katleman
date: Wed Nov 14 18:40:16 2012 -0800
Added tag jdk7u10-b16 for changeset 64f09d7549d3
changeset f2a347637a55 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=f2a347637a55
author: cl
date: Wed Nov 21 21:07:32 2012 -0800
Added tag jdk7u10-b17 for changeset 57c3355153d1
changeset 22cf8bc2ec47 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=22cf8bc2ec47
author: katleman
date: Wed Nov 28 15:41:50 2012 -0800
Added tag jdk7u10-b18 for changeset f2a347637a55
changeset e7952daece16 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=e7952daece16
author: katleman
date: Tue Dec 04 17:28:13 2012 -0800
Added tag jdk7u10-b30 for changeset 22cf8bc2ec47
changeset dff0f0272891 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/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.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b9ab9b203a41
author: katleman
date: Tue Jan 15 18:57:12 2013 -0800
Added tag jdk7u13-b09 for changeset b192d1487319
changeset 329f1a69c6cf in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=329f1a69c6cf
author: andrew
date: Mon Feb 11 21:39:39 2013 +0000
Merge jdk7u13-b20
changeset 97a8b625f6e9 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=97a8b625f6e9
author: andrew
date: Mon Feb 11 21:40:54 2013 +0000
Added tag icedtea-2.3.6 for changeset 329f1a69c6cf
diffstat:
.hgtags | 36 ++++++++++
src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java | 34 ++++++--
2 files changed, 60 insertions(+), 10 deletions(-)
diffs (120 lines):
diff -r f7168af6f467 -r 97a8b625f6e9 .hgtags
--- a/.hgtags Fri Feb 08 12:49:17 2013 +0000
+++ b/.hgtags Mon Feb 11 21:40:54 2013 +0000
@@ -213,3 +213,39 @@
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 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
+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
+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
+0000000000000000000000000000000000000000 icedtea-2.3.6
+329f1a69c6cfacd24290ae36780c37a6f69ecf62 icedtea-2.3.6
diff -r f7168af6f467 -r 97a8b625f6e9 src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
--- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Fri Feb 08 12:49:17 2013 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Mon Feb 11 21:40:54 2013 +0000
@@ -56,6 +56,8 @@
import java.util.Arrays;
import java.util.Comparator;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.sun.corba.se.impl.util.RepositoryId;
@@ -381,11 +383,23 @@
*/
}
- private static final class PersistentFieldsValue
- extends ClassValue<ObjectStreamField[]> {
+ private static final class PersistentFieldsValue {
+ private final ConcurrentMap map = new ConcurrentHashMap();
+ private static final Object NULL_VALUE =
+ (PersistentFieldsValue.class.getName() + ".NULL_VALUE");
+
PersistentFieldsValue() { }
- protected ObjectStreamField[] computeValue(Class<?> type) {
+ 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();
@@ -396,14 +410,15 @@
(java.io.ObjectStreamField[])pf.get(type);
return translateFields(fields);
}
- } catch (NoSuchFieldException | IllegalAccessException |
- IllegalArgumentException | ClassCastException e) {
- }
- return null;
+ } catch (NoSuchFieldException e1) {
+ } catch (IllegalAccessException e2) {
+ } catch (IllegalArgumentException e3) {
+ } catch (ClassCastException e4) { }
+ return NULL_VALUE;
}
private static ObjectStreamField[] translateFields(
- java.io.ObjectStreamField[] fields) {
+ java.io.ObjectStreamField[] fields) {
ObjectStreamField[] translation =
new ObjectStreamField[fields.length];
for (int i = 0; i < fields.length; i++) {
@@ -449,7 +464,7 @@
* If it is declared, use the declared serialPersistentFields.
* Otherwise, extract the fields from the class itself.
*/
- fields = persistentFieldsValue.get(cl);
+ fields = persistentFieldsValue.get(cl);
if (fields == null) {
/* Get all of the declared fields for this
@@ -646,7 +661,6 @@
superclass = null;
}
-
/*
* Set the class this version descriptor matches.
* The base class name and serializable hash must match.
More information about the distro-pkg-dev
mailing list