From 091478e0fd933348f529678dc21215e1f5e9dfed Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 26 Nov 2015 16:15:29 +0100 Subject: [PATCH] Disable ehcache statistics if necessary `EhCacheStatisticsProvider` uses the `StatisticsGateway` API introduced in ehcache 2.7 (march 2013). If an older ehcache version is present, we should back-off as this class is not available. Closes gh-4621 --- .../autoconfigure/CacheStatisticsAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java index 28157a9417..3ddd3fa3cc 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java @@ -21,6 +21,7 @@ import javax.cache.Caching; import com.hazelcast.core.IMap; import com.hazelcast.spring.cache.HazelcastCache; import net.sf.ehcache.Ehcache; +import net.sf.ehcache.statistics.StatisticsGateway; import org.infinispan.spring.provider.SpringCache; import org.springframework.boot.actuate.cache.CacheStatistics; @@ -72,7 +73,7 @@ public class CacheStatisticsAutoConfiguration { } @Configuration - @ConditionalOnClass({ EhCacheCache.class, Ehcache.class }) + @ConditionalOnClass({ EhCacheCache.class, Ehcache.class, StatisticsGateway.class }) static class EhCacheCacheStatisticsProviderConfiguration { @Bean