HHH-13563 ResultSetReturnImpl is looking up JdbcServices on each cons…

…truction
hibernate · Aug 12, 2019 · 25ca80b · 25ca80b
1 parent d4e1b7f
commit 25ca80b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
@@ -223,7 +223,7 @@ public StatementPreparer getStatementPreparer() {
 	@Override
 	public ResultSetReturn getResultSetReturn() {
 		if ( resultSetExtractor == null ) {
-			resultSetExtractor = new ResultSetReturnImpl( this );
+			resultSetExtractor = new ResultSetReturnImpl( this, jdbcServices );
 		}
 		return resultSetExtractor;
 	}

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
@@ -36,16 +36,9 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 	 *
 	 * @param jdbcCoordinator The JdbcCoordinator
 	 */
-	public ResultSetReturnImpl(JdbcCoordinator jdbcCoordinator) {
+	public ResultSetReturnImpl(JdbcCoordinator jdbcCoordinator, JdbcServices jdbcServices) {
 		this.jdbcCoordinator = jdbcCoordinator;
-
-		final JdbcServices jdbcServices = jdbcCoordinator.getJdbcSessionOwner()
-				.getJdbcSessionContext()
-				.getServiceRegistry()
-				.getService( JdbcServices.class );
-
 		this.dialect = jdbcServices.getDialect();
-
 		this.sqlStatementLogger = jdbcServices.getSqlStatementLogger();
 		this.sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
 	}