root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2016-12-30 16:11:13 +01:00
parent 9dfaf4de06 1f3de10101
commit 22a384ac28
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java vendored
View File

@ -73,10 +73,10 @@ public class CacheManagerCustomizers {
customizer.customize(cacheManager); customizer.customize(cacheManager);
} }
catch (ClassCastException ex) { 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 // event type for
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Non-matching transaction manager type for customizer: " logger.debug("Non-matching cache manager type for customizer: "
+ customizer, ex); + customizer, ex);
} }
} }

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
View File

@ -66,7 +66,7 @@ public class TransactionManagerCustomizers {
customizer.customize(transactionManager); customizer.customize(transactionManager);
} }
catch (ClassCastException ex) { 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 // event type for
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Non-matching transaction manager type for customizer: " logger.debug("Non-matching transaction manager type for customizer: "