Merge branch '1.5.x'

snicoll · snicoll · commit 22a384ac288f · 2016-12-30T16:11:13.000+01:00
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java
@@ -73,10 +73,10 @@ private void customize(CacheManager cacheManager, CacheManagerCustomizer customi
 			customizer.customize(cacheManager);
 		}
 		catch (ClassCastException ex) {
-			// Possibly a lambda-defined listener which we could not resolve the generic
+			// Possibly a lambda-defined customizer which we could not resolve the generic
 			// event type for
 			if (logger.isDebugEnabled()) {
-				logger.debug("Non-matching transaction manager type for customizer: "
+				logger.debug("Non-matching cache manager type for customizer: "
 						+ customizer, ex);
 			}
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
@@ -66,7 +66,7 @@ private void customize(PlatformTransactionManager transactionManager,
 			customizer.customize(transactionManager);
 		}
 		catch (ClassCastException ex) {
-			// Possibly a lambda-defined listener which we could not resolve the generic
+			// Possibly a lambda-defined customizer which we could not resolve the generic
 			// event type for
 			if (logger.isDebugEnabled()) {
 				logger.debug("Non-matching transaction manager type for customizer: "

Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,10 @@ private void customize(CacheManager cacheManager, CacheManagerCustomizer customi`
`73`	`73`	`customizer.customize(cacheManager);`
`74`	`74`	`}`
`75`	`75`	`catch (ClassCastException ex) {`
`76`		`- // Possibly a lambda-defined listener which we could not resolve the generic`
	`76`	`+ // Possibly a lambda-defined customizer which we could not resolve the generic`
`77`	`77`	`// event type for`
`78`	`78`	`if (logger.isDebugEnabled()) {`
`79`		`- logger.debug("Non-matching transaction manager type for customizer: "`
	`79`	`+ logger.debug("Non-matching cache manager type for customizer: "`
`80`	`80`	`+ customizer, ex);`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private void customize(PlatformTransactionManager transactionManager,`
`66`	`66`	`customizer.customize(transactionManager);`
`67`	`67`	`}`
`68`	`68`	`catch (ClassCastException ex) {`
`69`		`- // Possibly a lambda-defined listener which we could not resolve the generic`
	`69`	`+ // Possibly a lambda-defined customizer which we could not resolve the generic`
`70`	`70`	`// event type for`
`71`	`71`	`if (logger.isDebugEnabled()) {`
`72`	`72`	`logger.debug("Non-matching transaction manager type for customizer: "`