Re-add bean conditions for cloud config

- Re-add `@ConditionalOnMissingBean` to connection factory beans in cloud configurations
 - This is needed at least for CF case where auto-reconfiguration sets up connection factory beans
This commit is contained in:
Ilayaperumal Gopinathan
2015-08-28 12:33:09 -07:00
parent 6a5137a0c3
commit b60ccd1427
2 changed files with 2 additions and 0 deletions

View File

@@ -53,6 +53,7 @@ public class RabbitServiceAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(ConnectionFactory.class)
ConnectionFactory rabbitConnectionFactory(Cloud cloud) {
return cloud.getSingletonServiceConnector(ConnectionFactory.class, null);
}

View File

@@ -52,6 +52,7 @@ public class RedisServiceAutoConfiguration {
return new CloudFactory().getCloud();
}
@Bean
@ConditionalOnMissingBean(RedisConnectionFactory.class)
RedisConnectionFactory redisConnectionFactory(Cloud cloud) {
return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null);
}