/*
 * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.jdbc.datasource.embedded;

import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;

import javax.sql.DataSource;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * Base class for {@link EmbeddedDatabaseConfigurer} implementations
 * providing common shutdown behavior through a "SHUTDOWN" statement.
 *
 * @author Oliver Gierke
 * @author Juergen Hoeller
 * @since 3.0
 */
abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {

	protected final Log logger = LogFactory.getLog(getClass());


	@Override
	public void shutdown(DataSource dataSource, String databaseName) {
		Connection con = null;
		try {
			con = dataSource.getConnection();
			if (con != null) {
				try (Statement stmt = con.createStatement()) {
					stmt.execute("SHUTDOWN");
				}
			}
		}
		catch (SQLException ex) {
			logger.info("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);
				}
			}
		}
	}

}

@@ -20,10 +20,10 @@
 2-20
-19
+20
  the
@@ -873,16 +873,68 @@
 ctory;%0A%0A
+import org.springframework.jdbc.support.JdbcUtils;%0A%0A
 /**%0A * B
@@ -1675,168 +1675,39 @@
 %0A%09%09%09
-if (con != null) %7B%0A%09%09%09%09try %7B%0A%09%09%09%09%09con.close();%0A%09%09%09%09%7D%0A%09%09%09%09catch (Throwable ex) %7B%0A%09%09%09%09%09logger.debug(%22Could not close JDBC Connection on shutdown%22, ex);%0A%09%09%09%09%7D%0A%09%09%09%7D
+JdbcUtils.closeConnection(con);
 %0A%09%09%7D

Revise exception handling in AbstractEmbeddedDatabaseConfigurer