From 0112260767ee2b2bd2d06352a4e8db82a4a3e103 Mon Sep 17 00:00:00 2001 From: izeye Date: Mon, 15 Jun 2015 14:35:22 +0900 Subject: [PATCH] Fix typo in cache auto-configurations Make sure that the EhCache support is triggered if `spring.cache.ehcache.config` is set and the cache type is set to `auto`. Same thing for Hazelcast. Closes gh-3227 --- .../boot/autoconfigure/cache/EhCacheCacheConfiguration.java | 2 +- .../boot/autoconfigure/cache/HazelcastCacheConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java index 4f0a0ea621d..a3e19e3feaf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java @@ -71,7 +71,7 @@ class EhCacheCacheConfiguration { static class ConfigAvailableCondition extends CacheConfigFileCondition { public ConfigAvailableCondition() { - super("EhCache", "spring.config.ehcache", "classpath:/ehcache.xml"); + super("EhCache", "spring.cache.ehcache", "classpath:/ehcache.xml"); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java index 427ebaa0211..81893823bb0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java @@ -81,7 +81,7 @@ class HazelcastCacheConfiguration { static class ConfigAvailableCondition extends CacheConfigFileCondition { public ConfigAvailableCondition() { - super("Hazelcast", "spring.config.hazelcast", "file:./hazelcast.xml", + super("Hazelcast", "spring.cache.hazelcast", "file:./hazelcast.xml", "classpath:/hazelcast.xml"); }