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

Fix bugs in ReflectionTestUtils related to proxies

Browse Source 
Issue: SPR-14050
This commit is contained in:
Sam Brannen
2016-03-15 19:14:13 +01:00
parent 7c7e7865bf
commit 2d565c7944
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
View File

@@ -160,7 +160,8 @@ public class ReflectionTestUtils {
Assert.isTrue(targetObject != null || targetClass != null, Assert.isTrue(targetObject != null || targetClass != null,
"Either targetObject or targetClass for the field must be specified"); "Either targetObject or targetClass for the field must be specified");
Object ultimateTargetObject = AopTestUtils.getUltimateTargetObject(targetObject); Object ultimateTargetObject = (targetObject == null ? null
: AopTestUtils.getUltimateTargetObject(targetObject));
if (targetClass == null) { if (targetClass == null) {
targetClass = ultimateTargetObject.getClass(); targetClass = ultimateTargetObject.getClass();
@@ -237,7 +238,8 @@ public class ReflectionTestUtils {
Assert.isTrue(targetObject != null || targetClass != null, Assert.isTrue(targetObject != null || targetClass != null,
"Either targetObject or targetClass for the field must be specified"); "Either targetObject or targetClass for the field must be specified");
Object ultimateTargetObject = AopTestUtils.getUltimateTargetObject(targetObject); Object ultimateTargetObject = (targetObject == null ? null
: AopTestUtils.getUltimateTargetObject(targetObject));
if (targetClass == null) { if (targetClass == null) {
targetClass = ultimateTargetObject.getClass(); targetClass = ultimateTargetObject.getClass();