BeanWrapperImpl.setBeanInstance correctly exposes root object

jhoeller · jhoeller · commit fe17f8da41ac · 2016-07-20T21:44:46.000+02:00
Issue: SPR-14474 (cherry picked from commit 938b56c)
diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java
@@ -94,7 +94,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 
 	private String nestedPath = "";
 
-	private Object rootObject;
+	Object rootObject;
 
 	/**
 	 * Map with cached nested Accessors: nested path -> Accessor instance.
@@ -914,11 +914,9 @@ else if (Map.class.isAssignableFrom(type)) {
 				return BeanUtils.instantiate(type);
 			}
 		}
-		catch (Exception ex) {
-			// TODO: Root cause exception context is lost here; just exception message preserved.
-			// Should we throw another exception type that preserves context instead?
+		catch (Throwable ex) {
 			throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + name,
-					"Could not instantiate property type [" + type.getName() + "] to auto-grow nested property path: " + ex);
+					"Could not instantiate property type [" + type.getName() + "] to auto-grow nested property path", ex);
 		}
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -141,6 +141,7 @@ private BeanWrapperImpl(Object object, String nestedPath, BeanWrapperImpl parent
 	 */
 	public void setBeanInstance(Object object) {
 		this.wrappedObject = object;
+		this.rootObject = object;
 		this.typeConverterDelegate = new TypeConverterDelegate(this, this.wrappedObject);
 		setIntrospectionClass(object.getClass());
 	}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA`
`94`	`94`
`95`	`95`	`private String nestedPath = "";`
`96`	`96`
`97`		`- private Object rootObject;`
	`97`	`+ Object rootObject;`
`98`	`98`
`99`	`99`	`/**`
`100`	`100`	`* Map with cached nested Accessors: nested path -> Accessor instance.`
`@@ -914,11 +914,9 @@ else if (Map.class.isAssignableFrom(type)) {`
`914`	`914`	`return BeanUtils.instantiate(type);`
`915`	`915`	`}`
`916`	`916`	`}`
`917`		`- catch (Exception ex) {`
`918`		`- // TODO: Root cause exception context is lost here; just exception message preserved.`
`919`		`- // Should we throw another exception type that preserves context instead?`
	`917`	`+ catch (Throwable ex) {`
`920`	`918`	`throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + name,`
`921`		`- "Could not instantiate property type [" + type.getName() + "] to auto-grow nested property path: " + ex);`
	`919`	`+ "Could not instantiate property type [" + type.getName() + "] to auto-grow nested property path", ex);`
`922`	`920`	`}`
`923`	`921`	`}`
`924`	`922`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ private BeanWrapperImpl(Object object, String nestedPath, BeanWrapperImpl parent`
`141`	`141`	`*/`
`142`	`142`	`public void setBeanInstance(Object object) {`
`143`	`143`	`this.wrappedObject = object;`
	`144`	`+ this.rootObject = object;`
`144`	`145`	`this.typeConverterDelegate = new TypeConverterDelegate(this, this.wrappedObject);`
`145`	`146`	`setIntrospectionClass(object.getClass());`
`146`	`147`	`}`