Merge branch '2.0.x'

snicoll · snicoll · commit 456f5ce2f455 · 2018-08-21T10:03:12.000+02:00
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/OriginTrackedFieldError.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/OriginTrackedFieldError.java
@@ -46,7 +46,7 @@ public Origin getOrigin() {
 	@Override
 	public String toString() {
 		if (this.origin == null) {
-			return toString();
+			return super.toString();
 		}
 		return super.toString() + "; origin " + this.origin;
 	}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Origin getOrigin() {`
`46`	`46`	`@Override`
`47`	`47`	`public String toString() {`
`48`	`48`	`if (this.origin == null) {`
`49`		`- return toString();`
	`49`	`+ return super.toString();`
`50`	`50`	`}`
`51`	`51`	`return super.toString() + "; origin " + this.origin;`
`52`	`52`	`}`