From 2d565c7944fbb205ea093302deee336f41b11c29 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 15 Mar 2016 19:14:13 +0100 Subject: [PATCH] Fix bugs in ReflectionTestUtils related to proxies Issue: SPR-14050 --- .../org/springframework/test/util/ReflectionTestUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java index c41a487ef1..156d5c3960 100644 --- a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java +++ b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java @@ -160,7 +160,8 @@ public class ReflectionTestUtils { Assert.isTrue(targetObject != null || targetClass != null, "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) { targetClass = ultimateTargetObject.getClass(); @@ -237,7 +238,8 @@ public class ReflectionTestUtils { Assert.isTrue(targetObject != null || targetClass != null, "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) { targetClass = ultimateTargetObject.getClass();