Fix S3ChannelContext.FragmentState#cancelAndRelease (#5095)

deephaven · Feb 1, 2024 · 1c1aa7e · 1c1aa7e
1 parent b0dabbf
commit 1c1aa7e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableByteChannel.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableByteChannel.java
@@ -75,14 +75,20 @@ private boolean matches(final long fragmentIndex) {
             }
 
             private void cancelAndRelease() {
-                try (final SafeCloseable ignored = () -> SafeCloseable.closeAll(
-                        future == null ? null : () -> future.cancel(true), bufferRelease)) {
+                try (
+                        final SafeCloseable ignored1 = cancelOnClose(future, true);
+                        final SafeCloseable ignored2 = bufferRelease) {
                     fragmentIndex = UNINITIALIZED_FRAGMENT_INDEX;
                     future = null;
                     bufferRelease = null;
                 }
             }
 
+            // do not inline, needs to capture future at time of method call
+            private static SafeCloseable cancelOnClose(Future<?> future, boolean mayInterruptIfRunning) {
+                return future == null ? null : () -> future.cancel(mayInterruptIfRunning);
+            }
+
             private void set(
                     final long fragmentIndex,
                     @NotNull final Future<ByteBuffer> future,