Improve failure-safety of Cursor.

Any failures during opening the cursor or scanning now close the cursor and release associated resources.

Closes #2414

Author: mp911de

src/main/java/org/springframework/data/redis/core/ScanCursor.java

@@ -21,13 +21,14 @@
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 /**
  * Redis client agnostic {@link Cursor} implementation continuously loading additional results from Redis server until
  * reaching its starting point {@code zero}. <br />
  * <strong>Note:</strong> Please note that the {@link ScanCursor} has to be initialized ({@link #open()} prior to usage.
+ * Any failures during scanning will {@link #close() close} the cursor and release any associated resources such as
+ * connections.
  *
  * @author Christoph Strobl
  * @author Thomas Darimont
@@ -85,8 +86,16 @@ public ScanCursor(long cursorId, @Nullable ScanOptions options) {
 
 	private void scan(long cursorId) {
 
-		ScanIteration<T> result = doScan(cursorId, this.scanOptions);
-		processScanResult(result);
+		try {
+			processScanResult(doScan(cursorId, this.scanOptions));
+		} catch (RuntimeException e) {
+			try {
+				close();
+			} catch (RuntimeException nested) {
+				e.addSuppressed(nested);
+			}
+			throw e;
+		}
 	}
 
 	/**

src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java

@@ -233,6 +233,21 @@ void streamingCursorShouldForwardClose() {
 		assertThat(cursor.isClosed()).isTrue();
 	}
 
+	@Test // GH-2414
+	void shouldCloseCursorOnScanFailure() {
+
+		KeyBoundCursor<String> cursor = new KeyBoundCursor<String>("foo".getBytes(), 0, null) {
+			@Override
+			protected ScanIteration<String> doScan(byte[] key, long cursorId, ScanOptions options) {
+				throw new IllegalStateException();
+			}
+		};
+
+		assertThatIllegalStateException().isThrownBy(cursor::open);
+		assertThat(cursor.isOpen()).isFalse();
+		assertThat(cursor.isClosed()).isTrue();
+	}
+
 	private CapturingCursorDummy initCursor(Queue<ScanIteration<String>> values) {
 		CapturingCursorDummy cursor = new CapturingCursorDummy(values);
 		cursor.open();