From d93f2be5d81944cd078fe22f10a038dd775a590b Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 22 Feb 2021 17:54:26 +0100
Subject: [PATCH] [jOOQ/jOOQ#11498] DSLContext.connection() and
 connectionResult() shouldn't produce null Connection when detached

---
 jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 1f8671bda7..6bd56ae053 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -44,6 +44,7 @@ import org.jooq.conf.Settings;
 import org.jooq.conf.SettingsTools;
 import org.jooq.exception.ConfigurationException;
 import org.jooq.exception.DataAccessException;
+import org.jooq.exception.DetachedException;
 import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.SQLDialectNotSupportedException;
 import org.jooq.impl.BatchCRUD.Action;
@@ -439,6 +440,9 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     public <T> T connectionResult(ConnectionCallable<T> callable) {
         final Connection connection = configuration().connectionProvider().acquire();
 
+        if (connection == null)
+            throw new DetachedException("No Connection provided by ConnectionProvider");
+
         try {
             return callable.run(connection);
         }