Merge branch '2.4.x'

Closes gh-25870
2021-04-01 19:21:31 +01:00
parent 029f1b52b3 0005263f76
commit 66e9619d65
2 changed files with 94 additions and 1 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
@@ -107,7 +107,7 @@ public class CassandraAutoConfiguration {
 		}
 	}

-	@Bean
+	@Bean(destroyMethod = "")
 	@ConditionalOnMissingBean
 	public DriverConfigLoader cassandraDriverConfigLoader(CassandraProperties properties,
 			ObjectProvider<DriverConfigLoaderBuilderCustomizer> builderCustomizers) {