[#2699] Make sure to close the connection in case of error

I've tested it while working on #2518, but I don't know how to
create an isolated test.

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java

@@ -262,6 +262,10 @@ public interface Log extends BasicLogger {
 	@Message(id = 84, value = "The application requested a JDBC connection, but Hibernate Reactive doesn't use JDBC. This could be caused by a bug or the use of an unsupported feature in Hibernate Reactive")
 	SQLException notUsingJdbc();
 
+	@LogMessage(level = ERROR)
+	@Message(id = 86, value = "Error closing reactive connection")
+	void errorClosingConnection(@Cause Throwable throwable);
+
 	// Same method that exists in CoreMessageLogger
 	@LogMessage(level = WARN)
 	@Message(id = 104, value = "firstResult/maxResults specified with collection fetch; applying in memory!" )

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -135,6 +135,7 @@
 import static org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister.forceInitialize;
 import static org.hibernate.reactive.session.impl.SessionUtil.checkEntityFound;
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
+import static org.hibernate.reactive.util.impl.CompletionStages.failedFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.nullFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.rethrow;
 import static org.hibernate.reactive.util.impl.CompletionStages.returnNullorRethrow;
@@ -963,7 +964,7 @@ public CompletionStage<Void> reactiveForceFlush(EntityEntry entry) {
 		}
 
 		if ( getPersistenceContextInternal().getCascadeLevel() > 0 ) {
-			return CompletionStages.failedFuture( new ObjectDeletedException(
+			return failedFuture( new ObjectDeletedException(
 					"deleted object would be re-saved by cascade (remove deleted object from associations)",
 					entry.getId(),
 					entry.getPersister().getEntityName()
@@ -1616,7 +1617,23 @@ public void close() throws HibernateException {
 
 	@Override
 	public CompletionStage<Void> reactiveClose() {
-		super.close();
+		try {
+			super.close();
+			return closeConnection();
+		}
+		catch (RuntimeException e) {	
+			return closeConnection()
+					.handle( CompletionStages::handle )
+					.thenCompose( closeConnectionHandler -> {
+						if ( closeConnectionHandler.hasFailed() ) {
+							LOG.errorClosingConnection( closeConnectionHandler.getThrowable() );
+						}
+						return failedFuture( e );
+					} );
+		}
+	}
+
+	private CompletionStage<Void> closeConnection() {
 		return reactiveConnection != null
 				? reactiveConnection.close()
 				: voidFuture();