From 42af568feeea942dfed07396a9d96fbd11c7c76f Mon Sep 17 00:00:00 2001 From: tinkoff-dwh Date: Thu, 26 Oct 2017 10:25:57 +0500 Subject: [PATCH] [Buf Fix] fix exceptions in jdbc interpreter --- .../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java index f3dfddcbfd8..0265e2d6d99 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -38,6 +38,7 @@ import org.apache.commons.dbcp2.PoolableConnectionFactory; import org.apache.commons.dbcp2.PoolingDriver; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang.mutable.MutableBoolean; import org.apache.commons.pool2.ObjectPool; import org.apache.commons.pool2.impl.GenericObjectPool; @@ -60,8 +61,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Throwables; - import static org.apache.commons.lang.StringUtils.containsIgnoreCase; import static org.apache.commons.lang.StringUtils.isEmpty; import static org.apache.commons.lang.StringUtils.isNotEmpty; @@ -679,7 +678,7 @@ private InterpreterResult executeSql(String propertyKey, String sql, try { connection = getConnection(propertyKey, interpreterContext); } catch (Exception e) { - String errorMsg = Throwables.getStackTraceAsString(e); + String errorMsg = ExceptionUtils.getStackTrace(e); try { closeDBPool(user, propertyKey); } catch (SQLException e1) { @@ -757,7 +756,7 @@ private InterpreterResult executeSql(String propertyKey, String sql, } } catch (Throwable e) { logger.error("Cannot run " + sql, e); - String errorMsg = Throwables.getStackTraceAsString(e); + String errorMsg = ExceptionUtils.getStackTrace(e); interpreterResult.add(errorMsg); return new InterpreterResult(Code.ERROR, interpreterResult.message()); } finally {