HHH-18961 JtaIsolationDelegate, obtaining connection : NPE when SQLEx…

…ceptionConversionDelegate#convert returns null
hibernate · Jan 28, 2025 · f026405 · f026405
1 parent c9d4478
commit f026405
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...in/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java b/...in/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
@@ -200,7 +200,11 @@ private <T> T doTheWork(WorkExecutorVisitable<T> work) {
 			}
 		}
 		catch (SQLException e) {
-			throw sqlExceptionConverter().apply( e, "unable to obtain isolated JDBC connection" );
+			final JDBCException jdbcException = sqlExceptionConverter().apply( e, "unable to obtain isolated JDBC connection" );
+			if ( jdbcException == null ) {
+				throw new HibernateException( "Unable to obtain isolated JDBC connection", e );
+			}
+			throw jdbcException;
 		}
 	}