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

AbstractEmbeddedDatabaseConfigurer explicitly closes JDBC Connection on shutdown 

Issue: SPR-13474
This commit is contained in:
Juergen Hoeller 2015-09-21 20:42:50 +02:00
parent 299b7766fe
commit b23c23279b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,7 +18,6 @@ package org.springframework.jdbc.datasource.embedded;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -35,16 +34,25 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@Override @Override
public void shutdown(DataSource dataSource, String databaseName) { public void shutdown(DataSource dataSource, String databaseName) {
Connection con = null;
try { try {
Connection connection = dataSource.getConnection(); con = dataSource.getConnection();
Statement stmt = connection.createStatement(); con.createStatement().execute("SHUTDOWN");
stmt.execute("SHUTDOWN");
} }
catch (SQLException ex) { catch (SQLException ex) {
if (logger.isWarnEnabled()) { logger.warn("Could not shut down embedded database", ex);
logger.warn("Could not shut down embedded database", ex); }
finally {
if (con != null) {
try {
con.close();
}
catch (Throwable ex) {
logger.debug("Could not close JDBC Connection on shutdown", ex);
}
} }
} }
} }