Ensure async bindings are released before calling callback

JAVA-3662

Author: rozza

driver-core/src/main/com/mongodb/internal/async/client/OperationExecutorImpl.java

@@ -86,13 +86,10 @@ public void onResult(final AsyncReadWriteBinding binding, final Throwable t) {
                                             operation.executeAsync(binding, new SingleResultCallback<T>() {
                                                 @Override
                                                 public void onResult(final T result, final Throwable t) {
-                                                    try {
-                                                        labelException(t, session);
-                                                        unpinServerAddressOnTransientTransactionError(session, t);
-                                                        errHandlingCallback.onResult(result, t);
-                                                    } finally {
-                                                        binding.release();
-                                                    }
+                                                    labelException(session, t);
+                                                    unpinServerAddressOnTransientTransactionError(session, t);
+                                                    binding.release();
+                                                    errHandlingCallback.onResult(result, t);
                                                 }
                                             });
                                         }
@@ -132,13 +129,10 @@ public void onResult(final AsyncReadWriteBinding binding, final Throwable t) {
                                         operation.executeAsync(binding, new SingleResultCallback<T>() {
                                             @Override
                                             public void onResult(final T result, final Throwable t) {
-                                                try {
-                                                    labelException(t, session);
-                                                    unpinServerAddressOnTransientTransactionError(session, t);
-                                                    errHandlingCallback.onResult(result, t);
-                                                } finally {
-                                                    binding.release();
-                                                }
+                                                labelException(session, t);
+                                                unpinServerAddressOnTransientTransactionError(session, t);
+                                                binding.release();
+                                                errHandlingCallback.onResult(result, t);
                                             }
                                         });
                                     }
@@ -149,7 +143,7 @@ public void onResult(final T result, final Throwable t) {
         });
     }
 
-    private void labelException(final Throwable t, final AsyncClientSession session) {
+    private void labelException(@Nullable final AsyncClientSession session, @Nullable final Throwable t) {
         if (session != null && session.hasActiveTransaction()
                 && (t instanceof MongoSocketException || t instanceof MongoTimeoutException
                 || (t instanceof MongoQueryException && ((MongoQueryException) t).getErrorCode() == 91))
@@ -158,8 +152,9 @@ private void labelException(final Throwable t, final AsyncClientSession session)
         }
     }
 
-    private void unpinServerAddressOnTransientTransactionError(final @Nullable AsyncClientSession session, final Throwable throwable) {
-        if (session != null && throwable != null && throwable instanceof MongoException
+    private void unpinServerAddressOnTransientTransactionError(@Nullable final AsyncClientSession session,
+                                                               @Nullable final Throwable throwable) {
+        if (session != null && throwable instanceof MongoException
                 && ((MongoException) throwable).hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) {
             session.setPinnedServerAddress(null);
         }

driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java

@@ -58,6 +58,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.mongodb.ClusterFixture.getConnectionString;
 import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
@@ -414,11 +415,18 @@ public Void execute() {
                         }
                     } else if (operationName.equals("assertDifferentLsidOnLastTwoCommands")) {
                         List<CommandEvent> events = lastTwoCommandEvents();
-                        assertNotEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                        String eventsJson = commandListener.getCommandStartedEvents().stream()
+                                .map(e -> ((CommandStartedEvent) e).getCommand().toJson())
+                                .collect(Collectors.joining(", "));
+
+                        assertNotEquals(eventsJson, ((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
                                 ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
                     } else if (operationName.equals("assertSameLsidOnLastTwoCommands")) {
                         List<CommandEvent> events = lastTwoCommandEvents();
-                        assertEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                        String eventsJson = commandListener.getCommandStartedEvents().stream()
+                                        .map(e -> ((CommandStartedEvent) e).getCommand().toJson())
+                                        .collect(Collectors.joining(", "));
+                        assertEquals(eventsJson, ((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
                                 ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
                     } else if (operationName.equals("assertSessionDirty")) {
                         assertNotNull(clientSession);