stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8143185: Cleanup for handling proxies

Browse Source 
Reviewed-by: alanb, darcy, robm, rriggs, skoivu, rriggs
This commit is contained in:
Chris Hegarty 2015-12-01 12:38:28 +00:00
parent 343b6c3253
commit 78853b0d46
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
View File

@ -25,6 +25,7 @@
package sun.reflect.annotation; package sun.reflect.annotation;
import java.io.ObjectInputStream;
import java.lang.annotation.*; import java.lang.annotation.*;
import java.lang.reflect.*; import java.lang.reflect.*;
import java.io.Serializable; import java.io.Serializable;
@ -431,35 +432,72 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
private void readObject(java.io.ObjectInputStream s) private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException { throws java.io.IOException, ClassNotFoundException {
s.defaultReadObject(); ObjectInputStream.GetField fields = s.readFields();
@SuppressWarnings("unchecked")
Class<? extends Annotation> t = (Class<? extends Annotation>)fields.get("type", null);
@SuppressWarnings("unchecked")
Map<String, Object> streamVals = (Map<String, Object>)fields.get("memberValues", null);
// Check to make sure that types have not evolved incompatibly // Check to make sure that types have not evolved incompatibly
AnnotationType annotationType = null; AnnotationType annotationType = null;
try { try {
annotationType = AnnotationType.getInstance(type); annotationType = AnnotationType.getInstance(t);
} catch(IllegalArgumentException e) { } catch(IllegalArgumentException e) {
// Class is no longer an annotation type; time to punch out // Class is no longer an annotation type; time to punch out
throw new java.io.InvalidObjectException("Non-annotation type in annotation serial stream"); throw new java.io.InvalidObjectException("Non-annotation type in annotation serial stream");
} }
Map<String, Class<?>> memberTypes = annotationType.memberTypes(); Map<String, Class<?>> memberTypes = annotationType.memberTypes();
// consistent with runtime Map type
Map<String, Object> mv = new LinkedHashMap<>();
// If there are annotation members without values, that // If there are annotation members without values, that
// situation is handled by the invoke method. // situation is handled by the invoke method.
for (Map.Entry<String, Object> memberValue : memberValues.entrySet()) { for (Map.Entry<String, Object> memberValue : streamVals.entrySet()) {
String name = memberValue.getKey(); String name = memberValue.getKey();
Object value = null;
Class<?> memberType = memberTypes.get(name); Class<?> memberType = memberTypes.get(name);
if (memberType != null) { // i.e. member still exists if (memberType != null) { // i.e. member still exists
Object value = memberValue.getValue(); value = memberValue.getValue();
if (!(memberType.isInstance(value) || if (!(memberType.isInstance(value) ||
value instanceof ExceptionProxy)) { value instanceof ExceptionProxy)) {
memberValue.setValue( value = new AnnotationTypeMismatchExceptionProxy(
new AnnotationTypeMismatchExceptionProxy(
value.getClass() + "[" + value + "]").setMember( value.getClass() + "[" + value + "]").setMember(
annotationType.members().get(name))); annotationType.members().get(name));
} }
} }
mv.put(name, value);
}
UnsafeAccessor.setType(this, t);
UnsafeAccessor.setMemberValues(this, mv);
}
private static class UnsafeAccessor {
private static final jdk.internal.misc.Unsafe unsafe;
private static final long typeOffset;
private static final long memberValuesOffset;
static {
try {
unsafe = jdk.internal.misc.Unsafe.getUnsafe();
typeOffset = unsafe.objectFieldOffset
(AnnotationInvocationHandler.class.getDeclaredField("type"));
memberValuesOffset = unsafe.objectFieldOffset
(AnnotationInvocationHandler.class.getDeclaredField("memberValues"));
} catch (Exception ex) {
throw new ExceptionInInitializerError(ex);
}
}
static void setType(AnnotationInvocationHandler o,
Class<? extends Annotation> type) {
unsafe.putObject(o, typeOffset, type);
}
static void setMemberValues(AnnotationInvocationHandler o,
Map<String, Object> memberValues) {
unsafe.putObject(o, memberValuesOffset, memberValues);
} }
} }
} }