jdk8-mips64-public/corba: comparison src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java

-:3c73273667ae
+:80882eae6279
 /*
-* 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * questions.
 */
 /*
 * 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
 *
 */
 package com.sun.corba.se.impl.io;
 import java.io.InvalidClassException;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Hashtable;
 import com.sun.corba.se.impl.util.RepositoryId;
 import org.omg.CORBA.ValueMember;
 public static final long kDefaultUID = -1;
 private static Object noArgsList[] = {};
 private static Class noTypesList[] = {};
-private static Hashtable translatedFields;
 /** true if represents enum type */
 private boolean isEnum;
 private static final Bridge bridge =
 * after the lock on the global class descriptor table has been
 * released.
 */
 }
+private static final class PersistentFieldsValue
+extends ClassValue<ObjectStreamField[]> {
+PersistentFieldsValue() { }
+protected ObjectStreamField[] 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 | IllegalAccessException |
+IllegalArgumentException | ClassCastException e) {
+}
+return null;
+}
+private static ObjectStreamField[] translateFields(
+java.io.ObjectStreamField[] fields) {
+ObjectStreamField[] translation =
+new ObjectStreamField[fields.length];
+for (int i = 0; i < fields.length; i++) {
+translation[i] = new ObjectStreamField(fields[i].getName(),
+fields[i].getType());
+}
+return translation;
+}
+}
+private static final PersistentFieldsValue persistentFieldsValue =
+new PersistentFieldsValue();
 /*
 * Initialize class descriptor.  This method is only invoked on class
 * descriptors created via calls to lookupInternal().  This method is kept
 * separate from the ObjectStreamClass constructor so that lookupInternal
 * does not have to hold onto a global class descriptor table lock while the
 public Object run() {
 /* Fill in the list of persistent fields.
 * If it is declared, use the declared serialPersistentFields.
 * Otherwise, extract the fields from the class itself.
 */
-try {
+fields = persistentFieldsValue.get(cl);
-Field pf = cl.getDeclaredField("serialPersistentFields");
-// serial bug 7; the serialPersistentFields were not
-// being read and stored as Accessible bit was not set
-pf.setAccessible(true);
-// serial bug 7; need to find if the field is of type
-// java.io.ObjectStreamField
-java.io.ObjectStreamField[] f =
-(java.io.ObjectStreamField[])pf.get(cl);
-int mods = pf.getModifiers();
-if ((Modifier.isPrivate(mods)) &&
-(Modifier.isStatic(mods)) &&
-(Modifier.isFinal(mods)))
-{
-fields = (ObjectStreamField[])translateFields((Object[])pf.get(cl));
-}
-} catch (NoSuchFieldException e) {
-fields = null;
-} catch (IllegalAccessException e) {
-fields = null;
-} catch (IllegalArgumentException e) {
-fields = null;
-} catch (ClassCastException e) {
-/* Thrown if a field serialPersistentField exists
-* but it is not of type ObjectStreamField.
-*/
-fields = null;
-}
 if (fields == null) {
 /* Get all of the declared fields for this
 * Class. setAccessible on all fields so they
 * can be accessed later.  Create a temporary
 name = n;
 suid = s;
 superclass = null;
 }
-private static Object[] translateFields(Object objs[])
-throws NoSuchFieldException {
-try{
-java.io.ObjectStreamField fields[] = (java.io.ObjectStreamField[])objs;
-Object translation[] = null;
-if (translatedFields == null)
-translatedFields = new Hashtable();
-translation = (Object[])translatedFields.get(fields);
-if (translation != null)
-return translation;
-else {
-Class osfClass = Class.forName("com.sun.corba.se.impl.io.ObjectStreamField");
-translation = (Object[])java.lang.reflect.Array.newInstance(osfClass, objs.length);
-Object arg[] = new Object[2];
-Class types[] = {String.class, Class.class};
-Constructor constructor = osfClass.getDeclaredConstructor(types);
-for (int i = fields.length -1; i >= 0; i--){
-arg[0] = fields[i].getName();
-arg[1] = fields[i].getType();
-translation[i] = constructor.newInstance(arg);
-}
-translatedFields.put(fields, translation);
-}
-return (Object[])translation;
-}
-catch(Throwable t){
-NoSuchFieldException nsfe = new NoSuchFieldException();
-nsfe.initCause( t ) ;
-throw nsfe ;
-}
-}
 /*
 * Set the class this version descriptor matches.
 * The base class name and serializable hash must match.
 * Fill in the reflected Fields that will be used

Mercurial > jdk8-mips64-public > corba / file comparison

comparison: src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java

src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java