Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #771 from pathfinder-name/branches/oracle_savepoint

Browse Source 
解决oracle下回滚savepoint后输出日志时抛出异常
This commit is contained in:
高铁
2015-01-12 22:48:37 +08:00
parent 17a47535f3 a21f91814a
commit 31246e2cd3
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/logging/LogFilter.java
+16 -2
View File
@@ -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;
}
}