From 517b40d9b969b506d83a971ca7c9164b870e2fc9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 10 Oct 2014 13:49:15 -0700 Subject: [PATCH] Don't call close() on JNDI DataSource Update the JNDI auto-configured DataSource so that the close method isn't called when the ApplicationContext is closed. Fixes gh-1520 --- .../autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java index b033bde80d..8dfe8079c7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java @@ -44,11 +44,11 @@ import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup; @EnableConfigurationProperties(DataSourceProperties.class) public class JndiDataSourceAutoConfiguration { - @Bean + @Bean(destroyMethod = "") @ConditionalOnMissingBean public DataSource dataSource(DataSourceProperties properties) { JndiDataSourceLookup dataSourceLookup = new JndiDataSourceLookup(); return dataSourceLookup.getDataSource(properties.getJndiName()); } -} \ No newline at end of file +}