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

Fix bizarre compiler error

This commit is contained in:
Dave Syer 2013-12-23 22:12:54 +00:00
parent f5ad4be2c1
commit c94fb7fc53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java
View File

@ -24,7 +24,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration.RedisProperties.Pool;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -100,7 +99,9 @@ public class RedisAutoConfiguration {
private PoolConfig poolConfig() { private PoolConfig poolConfig() {
PoolConfig pool = new PoolConfig(); PoolConfig pool = new PoolConfig();
Pool props = this.config.getPool(); // FQCN to avoid bizarre compiler error on command line build (!?)
org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration.RedisProperties.Pool props = this.config
.getPool();
if (props != null) { if (props != null) {
pool.setMaxActive(props.getMaxActive()); pool.setMaxActive(props.getMaxActive());
pool.setMaxIdle(props.getMaxIdle()); pool.setMaxIdle(props.getMaxIdle());