Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid package import cycles

Browse Source
This commit is contained in:
Juergen Hoeller
2020-02-25 14:55:53 +01:00
parent 2f12351292
commit 6db20eb773
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
View File

@@ -25,8 +25,6 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.jdbc.support.JdbcUtils;
/**
* Base class for {@link EmbeddedDatabaseConfigurer} implementations
* providing common shutdown behavior through a "SHUTDOWN" statement.
@@ -55,7 +53,17 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
logger.info("Could not shut down embedded database", ex);
}
finally {
JdbcUtils.closeConnection(con);
if (con != null) {
try {
con.close();
}
catch (SQLException ex) {
logger.debug("Could not close JDBC Connection on shutdown", ex);
}
catch (Throwable ex) {
logger.debug("Unexpected exception on closing JDBC Connection", ex);
}
}
}
}