From c2bb7ffde061f5a60c5c4425dcc2ce8e6e8a9bfb Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@datageekery.com>
Date: Fri, 29 Aug 2025 13:15:25 +0200
Subject: [PATCH] [jOOQ/jOOQ#18940] Fix NPE

---
 jOOQ/src/main/java/org/jooq/impl/Tools.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index fa953032a3..92f18e0c10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -1652,6 +1652,14 @@ final class Tools {
         return configuration(scope != null ? scope.configuration() : null);
     }
 
+    /**
+     * Allows <code>null</code> arguments, unlike
+     * {@link ContextConverter#scoped(Converter)}.
+     */
+    static final <T, U> ContextConverter<T, U> scoped(Converter<T, U> converter) {
+        return converter != null ? ContextConverter.scoped(converter) : null;
+    }
+
     /**
      * Get a converter from a {@link ConverterProvider} or <code>null</code> if
      * no converter could be provided.
@@ -1669,7 +1677,7 @@ final class Tools {
         if (result == null && tType == Converters.UnknownType.class)
             result = converter(configuration, instance, (Class<T>) (instance == null ? Object.class : instance.getClass()), uType);
 
-        return result == null ? null : scoped(result);
+        return scoped(result);
     }
 
     /**