HHH-16461 @Version + session.refresh(entity, LockMode.PESSIMISTIC_WRITE) leads to StaleObjectStateException

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmJdbcExecutionContextAdapter.java

@@ -75,4 +75,8 @@ public boolean hasQueryExecutionToBeAddedToStatistics() {
 		return true;
 	}
 
+	@Override
+	public boolean upgradeLocks() {
+		return true;
+	}
 }

hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java

@@ -90,4 +90,12 @@ default boolean hasQueryExecutionToBeAddedToStatistics() {
 		return false;
 	}
 
+	/**
+	 * Does this query return objects that might be already cached
+	 * by the session, whose lock mode may need upgrading
+	 */
+	default boolean upgradeLocks(){
+		return false;
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java

@@ -571,7 +571,7 @@ && getEntityKey().getIdentifier().equals( executionContext.getEntityId() ) ) {
 	}
 
 	private void upgradeLockMode(RowProcessingState rowProcessingState) {
-		if ( lockMode != LockMode.NONE ) {
+		if ( lockMode != LockMode.NONE && rowProcessingState.upgradeLocks() ) {
 			final EntityEntry entry =
 					rowProcessingState.getSession().getPersistenceContextInternal()
 							.getEntry( entityInstance );

hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowProcessingStateStandardImpl.java

@@ -201,4 +201,9 @@ public Initializer resolveInitializer(NavigablePath path) {
 	public boolean hasCollectionInitializers() {
 		return this.initializers.hasCollectionInitializers();
 	}
+
+	@Override
+	public boolean upgradeLocks() {
+		return executionContext.upgradeLocks();
+	}
 }