Merge branch '5.1.x'

bclozel · bclozel · commit 05d7ab432847 · 2019-02-06T20:00:02.000+01:00
diff --git a/spring-core/src/main/java/org/springframework/core/log/CompositeLog.java b/spring-core/src/main/java/org/springframework/core/log/CompositeLog.java
@@ -119,7 +119,7 @@ public void error(Object message) {
 
 	@Override
 	public void error(Object message, Throwable ex) {
-		this.errorLogger.error(message);
+		this.errorLogger.error(message, ex);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public void error(Object message) {`
`119`	`119`
`120`	`120`	`@Override`
`121`	`121`	`public void error(Object message, Throwable ex) {`
`122`		`- this.errorLogger.error(message);`
	`122`	`+ this.errorLogger.error(message, ex);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`