Do not close transactional Connection in doReleaseConnection

Closes gh-28133
spring-projects · Oct 11, 2023 · 80e82cd · 80e82cd
1 parent 66ce8c9
commit 80e82cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionFactoryUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionFactoryUtils.java
@@ -178,6 +178,7 @@ public static Mono<Void> doReleaseConnection(Connection connection, ConnectionFa
 			if (conHolder != null && connectionEquals(conHolder, connection)) {
 				// It's the transactional Connection: Don't close it.
 				conHolder.released();
+				return Mono.empty();
 			}
 			return Mono.from(connection.close());
 		}).onErrorResume(NoTransactionException.class, ex -> Mono.from(connection.close()));

diff --git a/...org/springframework/r2dbc/connection/TransactionAwareConnectionFactoryProxyUnitTests.java b/...org/springframework/r2dbc/connection/TransactionAwareConnectionFactoryProxyUnitTests.java
@@ -146,14 +146,15 @@ void shouldEmitBoundConnection() {
 		ConnectionFactoryUtils.getConnection(connectionFactoryMock)
 				.doOnNext(transactionalConnection::set).flatMap(connection -> proxyCf.create()
 				.doOnNext(wrappedConnection -> assertThat(((Wrapped<?>) wrappedConnection).unwrap()).isSameAs(connection)))
-				.as(rxtx::transactional)
 				.flatMapMany(Connection::close)
+				.as(rxtx::transactional)
 				.as(StepVerifier::create)
 				.verifyComplete();
 
+		verify(connectionFactoryMock, times(1)).create();
+		verify(connectionMock1, times(1)).close();
 		verifyNoInteractions(connectionMock2);
 		verifyNoInteractions(connectionMock3);
-		verify(connectionFactoryMock, times(1)).create();
 	}
 
 }