diff --git a/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java b/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java index c2ce922c5ee..eb5773fb445 100644 --- a/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java +++ b/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java @@ -94,6 +94,8 @@ public void close() { opened = false; } catch (SQLException e) { // ignore + } finally { + ErrorContext.instance().reset(); } } @@ -163,11 +165,7 @@ public CursorIterator() { @Override public boolean hasNext() { if (object == null) { - try { - object = fetchNextUsingRowBound(); - } finally { - ErrorContext.instance().reset(); - } + object = fetchNextUsingRowBound(); } return object != null; } @@ -178,11 +176,7 @@ public T next() { T next = object; if (next == null) { - try { - next = fetchNextUsingRowBound(); - } finally { - ErrorContext.instance().reset(); - } + next = fetchNextUsingRowBound(); } if (next != null) {