From a21f91814a134394051c5539d02a2fc9fab969e9 Mon Sep 17 00:00:00 2001 From: yaowei Date: Tue, 2 Sep 2014 08:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3oracle=E4=B8=8B=E5=9B=9E?= =?UTF-8?q?=E6=BB=9Asavepoint=E5=90=8E=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=97=B6=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../druid/filter/logging/LogFilter.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index 66a194a1f4..9a8a487653 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -356,7 +356,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM Savepoint savepoint = chain.connection_setSavepoint(connection); if (isConnectionLogEnabled()) { - connectionLog("{conn " + connection.getId() + "} setSavepoint-" + savepoint.getSavepointId()); + connectionLog("{conn " + connection.getId() + "} setSavepoint-" + savepointToString(savepoint)); } return savepoint; @@ -389,7 +389,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM super.connection_rollback(chain, connection, savePoint); if (connectionRollbackAfterLogEnable && isConnectionLogEnabled()) { - connectionLog("{conn " + connection.getId() + "} rollback -> " + savePoint.getSavepointId()); + connectionLog("{conn " + connection.getId() + "} rollback -> " + savepointToString(savePoint)); } } @@ -859,4 +859,18 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM } return null; } + + protected String savepointToString(Savepoint savePoint) { + String savePointString = null; + try{ + savePointString = savePoint.getSavepointName(); + } catch (SQLException e) { + try { + savePointString = String.valueOf(savePoint.getSavepointId()); + } catch (SQLException e1) { + savePointString = savePoint.toString(); + } + } + return savePointString; + } }