Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[ZEPPELIN-1988] fix

Browse source
This commit is contained in:
Tinkoff DWH 2017-02-28 14:37:31 +05:00
parent ba3477a6af
commit 9d37bc46e3
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
View file

@ -341,7 +341,9 @@ public class JDBCInterpreter extends Interpreter {
if (!getJDBCConfiguration(user).isConnectionInDBDriverPool(propertyKey)) {
createConnectionPool(url, user, propertyKey, properties);
executePreCode(DriverManager.getConnection(jdbcDriver));
try (Connection connection = DriverManager.getConnection(jdbcDriver)) {
executePreCode(connection);
}
}
return DriverManager.getConnection(jdbcDriver);
}
@ -546,25 +548,13 @@ public class JDBCInterpreter extends Interpreter {
String precode = getProperty(ZEPPELIN_PRECODE_PROPERTY_KEY);
if (StringUtils.isNotEmpty(precode)) {
logger.info("Run SQL precode '{}'", precode);
try {
Statement statement = connection.createStatement();
try (Statement statement = connection.createStatement()) {
statement.execute(precode);
if (!connection.getAutoCommit()) {
connection.commit();
}
if (statement != null) {
statement.close();
}
} catch (SQLException e) {
logger.error("Cannot create precode statement", e);
} finally {
if (connection != null) {
try {
connection.close();
} catch (SQLException e) {
logger.error("Cannot close connection of precode", e);
}
}
}
}
}