From ad61c8f1d41a86552e297058c3fc7b7fd93fe350 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Wed, 11 Aug 2021 09:23:43 +0200 Subject: [PATCH] Fix errors after upstream/main merge --- .../hibernate/engine/spi/SharedSessionContractImplementor.java | 2 +- .../main/java/org/hibernate/internal/StatelessSessionImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java index 9ae40e8c40..efedcf785c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java @@ -321,7 +321,7 @@ public interface SharedSessionContractImplementor /** * Instantiate the entity class of an EntityPersister, initializing with the given identifier. - * This is more efficient than {@link #instantiate(String, Serializable)} but not always + * This is more efficient than {@link #instantiate(String, Object)} but not always * interchangeable: a single persister might be responsible for multiple types. */ Object instantiate(EntityPersister persister, Object id) throws HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java index 2025857b84..c19ed7bfe5 100755 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -171,7 +171,7 @@ public class StatelessSessionImpl extends AbstractSharedSessionContract implemen return get( getFactory().getMetamodel().entityPersister( entityName ), id, lockMode ); } - protected Object get(final EntityPersister ep, final Serializable id, final LockMode lockMode) { + protected Object get(final EntityPersister ep, final Object id, final LockMode lockMode) { checkOpen(); Object result = ep.load( id, null, getNullSafeLockMode( lockMode ), this );