Prevent reporting previous error on session closure

Author: injectives

driver/src/main/java/org/neo4j/driver/internal/cursor/RxResultCursorImpl.java

@@ -22,6 +22,7 @@
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 
 import org.neo4j.driver.Record;
@@ -42,6 +43,7 @@ public class RxResultCursorImpl implements RxResultCursor
     private final PullResponseHandler pullHandler;
     private final Throwable runResponseError;
     private final CompletableFuture<ResultSummary> summaryFuture = new CompletableFuture<>();
+    private final AtomicReference<Throwable> lastReportedError = new AtomicReference<>();
     private boolean resultConsumed;
     private RecordConsumerStatus consumerStatus = NOT_INSTALLED;
 
@@ -81,6 +83,13 @@ public void installRecordConsumer( BiConsumer<Record,Throwable> recordConsumer )
         }
         consumerStatus = recordConsumer == DISCARD_RECORD_CONSUMER ?
                          DISCARD_INSTALLED : INSTALLED;
+        recordConsumer = recordConsumer.andThen( ( record, throwable ) ->
+                                                 {
+                                                     if ( throwable != null )
+                                                     {
+                                                         lastReportedError.set( throwable );
+                                                     }
+                                                 } );
         pullHandler.installRecordConsumer( recordConsumer );
         assertRunCompletedSuccessfully();
     }
@@ -105,7 +114,12 @@ public void cancel()
     public CompletionStage<Throwable> discardAllFailureAsync()
     {
         // calling this method will enforce discarding record stream and finish running cypher query
-        return summaryAsync().thenApply( summary -> (Throwable) null ).exceptionally( error -> error );
+        return summaryAsync().thenApply( summary -> (Throwable) null ).exceptionally(
+                error ->
+                {
+                    Throwable lastReported = lastReportedError.get();
+                    return lastReported != null && (lastReported == error || lastReported == error.getCause()) ? null : error;
+                } );
     }
 
     @Override
@@ -153,6 +167,7 @@ private void installSummaryConsumer()
             {
                 // We will only report the error to summary if there is no user record consumer installed
                 // When a user record consumer is installed, the error will be reported to record consumer instead.
+                lastReportedError.set( error );
                 summaryFuture.completeExceptionally( error );
             }
             else if ( summary != null )