root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

SerializableTypeWrapper reobtains type accessors from declaring interface 

Issue: SPR-14487
(cherry picked from commit 8580483)
This commit is contained in:
Juergen Hoeller 2016-07-19 19:22:32 +02:00
parent 90752f9d87
commit e0d81b97bb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -372,6 +372,8 @@ abstract class SerializableTypeWrapper {
private final String methodName; private final String methodName;
private final Class<?> declaringClass;
private final int index; private final int index;
private transient Method method; private transient Method method;
@ -381,6 +383,7 @@ abstract class SerializableTypeWrapper {
public MethodInvokeTypeProvider(TypeProvider provider, Method method, int index) { public MethodInvokeTypeProvider(TypeProvider provider, Method method, int index) {
this.provider = provider; this.provider = provider;
this.methodName = method.getName(); this.methodName = method.getName();
this.declaringClass = method.getDeclaringClass();
this.index = index; this.index = index;
this.method = method; this.method = method;
} }
@ -404,7 +407,7 @@ abstract class SerializableTypeWrapper {
private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException { private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
inputStream.defaultReadObject(); inputStream.defaultReadObject();
this.method = ReflectionUtils.findMethod(this.provider.getType().getClass(), this.methodName); this.method = ReflectionUtils.findMethod(this.declaringClass, this.methodName);
Assert.state(Type.class == this.method.getReturnType() || Type[].class == this.method.getReturnType()); Assert.state(Type.class == this.method.getReturnType() || Type[].class == this.method.getReturnType());
} }
} }