提交 455b56f3 authored 作者: Thomas Mueller's avatar Thomas Mueller

Reset the "cancelled" flag before executing.

上级 2d6e9237
...@@ -39,7 +39,7 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -39,7 +39,7 @@ public class JdbcStatement extends TraceObject implements Statement {
private int lastExecutedCommandType; private int lastExecutedCommandType;
private ArrayList<String> batchCommands; private ArrayList<String> batchCommands;
private boolean escapeProcessing = true; private boolean escapeProcessing = true;
private boolean cancelled = false; private boolean cancelled;
JdbcStatement(JdbcConnection conn, int id, int resultSetType, int resultSetConcurrency, boolean closeWithResultSet) { JdbcStatement(JdbcConnection conn, int id, int resultSetType, int resultSetConcurrency, boolean closeWithResultSet) {
this.conn = conn; this.conn = conn;
...@@ -542,9 +542,11 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -542,9 +542,11 @@ public class JdbcStatement extends TraceObject implements Statement {
} }
/** /**
* @return true if this statement has been cancelled. * Check whether the statement was cancelled.
*
* @return true if yes
*/ */
public boolean isCancelled() { public boolean wasCancelled() {
return cancelled; return cancelled;
} }
...@@ -1004,6 +1006,7 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -1004,6 +1006,7 @@ public class JdbcStatement extends TraceObject implements Statement {
} }
} }
} finally { } finally {
cancelled = false;
resultSet = null; resultSet = null;
updateCount = -1; updateCount = -1;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论