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

8001309: Better handling of annotation interfaces

Browse Source 
Reviewed-by: ahgross, smarks, alanb
This commit is contained in:
Joe Darcy 2013-03-19 14:59:33 -07:00
parent 33af6236b8
commit ed9fe2bcb3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -337,12 +337,15 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
try { try {
annotationType = AnnotationType.getInstance(type); annotationType = AnnotationType.getInstance(type);
} catch(IllegalArgumentException e) { } catch(IllegalArgumentException e) {
// Class is no longer an annotation type; all bets are off // Class is no longer an annotation type; time to punch out
return; throw new java.io.InvalidObjectException("Non-annotation type in annotation serial stream");
} }
Map<String, Class<?>> memberTypes = annotationType.memberTypes(); Map<String, Class<?>> memberTypes = annotationType.memberTypes();
// If there are annotation members without values, that
// situation is handled by the invoke method.
for (Map.Entry<String, Object> memberValue : memberValues.entrySet()) { for (Map.Entry<String, Object> memberValue : memberValues.entrySet()) {
String name = memberValue.getKey(); String name = memberValue.getKey();
Class<?> memberType = memberTypes.get(name); Class<?> memberType = memberTypes.get(name);