Skip to content

Commit 7500cae

Browse files
author
Phillip Webb
committed
Fix ArrayStoreException reading subclassed enums
Fix ASM AnnotationAttributesReadingVisitor to correctly deal with subclasses enums. Issue: SPR-10914 (cherry picked from 8abe949)
1 parent 7994b63 commit 7500cae

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import org.apache.commons.logging.Log;
3030
import org.apache.commons.logging.LogFactory;
31-
3231
import org.springframework.asm.AnnotationVisitor;
3332
import org.springframework.asm.SpringAsmInfo;
3433
import org.springframework.asm.Type;
@@ -122,7 +121,13 @@ public void visit(String attributeName, Object attributeValue) {
122121
newValue = ObjectUtils.addObjectToArray((Object[]) existingValue, newValue);
123122
}
124123
else {
125-
Object[] newArray = (Object[]) Array.newInstance(newValue.getClass(), 1);
124+
Class<?> arrayClass = newValue.getClass();
125+
if(Enum.class.isAssignableFrom(arrayClass)) {
126+
while(arrayClass.getSuperclass() != null && !arrayClass.isEnum()) {
127+
arrayClass = arrayClass.getSuperclass();
128+
}
129+
}
130+
Object[] newArray = (Object[]) Array.newInstance(arrayClass, 1);
126131
newArray[0] = newValue;
127132
newValue = newArray;
128133
}

0 commit comments

Comments
 (0)