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

Merge pull request #2769 from eddumelendez/gh-2768 

* gh-2768:
  Add missing type check on EhCacheCacheConfiguration
This commit is contained in:
Stephane Nicoll 2015-04-03 15:11:07 +02:00
parent 22b1ffd9af fcae5a7df8
commit b586bce3b7
1 changed files with 3 additions and 1 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/EhCacheCacheConfiguration.java vendored
View File

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.cache;
import net.sf.ehcache.Cache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -35,7 +37,7 @@ import org.springframework.core.io.Resource;
* @since 1.3.0
*/
@Configuration
@ConditionalOnClass(EhCacheCacheManager.class)
@ConditionalOnClass({Cache.class, EhCacheCacheManager.class})
@ConditionalOnMissingBean(CacheManager.class)
@Conditional({ CacheCondition.class,
EhCacheCacheConfiguration.ConfigAvailableCondition.class })