Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression in Jaxb2Marshaller regarding JdkVersion

Browse Source 
Issue: SPR-13312
This commit is contained in:
Sam Brannen
2015-08-12 17:35:03 +02:00
parent d8794a1edc
commit 27e9db8c8c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
View File

@@ -583,15 +583,16 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
if (JAXBElement.class == parameterizedType.getRawType() && if (JAXBElement.class == parameterizedType.getRawType() &&
parameterizedType.getActualTypeArguments().length == 1) { parameterizedType.getActualTypeArguments().length == 1) {
boolean isJdk6 = (org.springframework.core.JdkVersion.getMajorJavaVersion() <= org.springframework.core.JdkVersion.JAVA_16); boolean isJdk6 = (org.springframework.core.JdkVersion.getMajorJavaVersion() <= org.springframework.core.JdkVersion.JAVA_16);
boolean isJdk7 = (org.springframework.core.JdkVersion.getMajorJavaVersion() >= org.springframework.core.JdkVersion.JAVA_17);
Type typeArgument = parameterizedType.getActualTypeArguments()[0]; Type typeArgument = parameterizedType.getActualTypeArguments()[0];
if (typeArgument instanceof Class) { if (typeArgument instanceof Class) {
Class<?> classArgument = (Class<?>) typeArgument; Class<?> classArgument = (Class<?>) typeArgument;
if (isJdk6 && classArgument.isArray()) { if (isJdk7 && classArgument.isArray()) {
return (isPrimitiveWrapper(classArgument) || isStandardClass(classArgument) || return (classArgument.getComponentType() == Byte.TYPE);
supportsInternal(classArgument, false));
} }
else { else {
return (classArgument.getComponentType() == Byte.TYPE); return (isPrimitiveWrapper(classArgument) || isStandardClass(classArgument) ||
supportsInternal(classArgument, false));
} }
} }
else if (isJdk6 && typeArgument instanceof GenericArrayType) { else if (isJdk6 && typeArgument instanceof GenericArrayType) {