Skip to content

Commit 11fce11

Browse files
committed
Upgrade Hibernate ORM to 6.2.3.Final
1 parent 7159929 commit 11fce11

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ version = projectVersion
5353
// ./gradlew clean build -PhibernateOrmVersion=5.6.15-SNAPSHOT
5454
ext {
5555
if ( !project.hasProperty('hibernateOrmVersion') ) {
56-
hibernateOrmVersion = '6.2.2.Final'
56+
hibernateOrmVersion = '6.2.3.Final'
5757
}
5858
if ( !project.hasProperty( 'hibernateOrmGradlePluginVersion' ) ) {
5959
// Same as ORM as default

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/StandardReactiveSelectExecutor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,9 @@ public boolean shouldReturnProxies() {
176176

177177
final JdbcValuesSourceProcessingStateStandardImpl valuesProcessingState = new JdbcValuesSourceProcessingStateStandardImpl(
178178
executionContext,
179-
processingOptions,
180-
executionContext::registerLoadingEntityEntry
179+
processingOptions
181180
);
182181

183-
184182
final ReactiveRowReader<R> rowReader = ReactiveResultsHelper.createRowReader(
185183
executionContext,
186184
// If follow-on locking is used, we must omit the lock options here,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityJoinedFetchInitializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public ReactiveEntityJoinedFetchInitializer(
7373
}
7474
}
7575

76+
@Override
77+
protected void registerLoadingEntityInstanceFromExecutionContext(RowProcessingState rowProcessingState, Object instance) {
78+
// we want the EntityResultInitializer to take care of the instance
79+
}
7680

7781
@Override
7882
public void resolveKey(RowProcessingState rowProcessingState) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityResultInitializer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.hibernate.sql.results.graph.Fetch;
1515
import org.hibernate.sql.results.graph.basic.BasicFetch;
1616
import org.hibernate.sql.results.graph.entity.EntityResultGraphNode;
17+
import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
1718

1819
/**
1920
* @see org.hibernate.sql.results.graph.entity.internal.EntityResultInitializer
@@ -54,4 +55,11 @@ protected boolean isEntityReturn() {
5455
public String toString() {
5556
return CONCRETE_NAME + "(" + getNavigablePath() + ")";
5657
}
58+
59+
@Override
60+
protected void registerLoadingEntityInstanceFromExecutionContext(
61+
RowProcessingState rowProcessingState,
62+
Object instance) {
63+
registerLoadingEntity( rowProcessingState, instance );
64+
}
5765
}

0 commit comments

Comments
 (0)