Skip to content

Commit fbfb104

Browse files
committed
HHH-18631 AssertionError when loading an entity after removing another, associated entity
1 parent eda6acc commit fbfb104

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.hibernate.metamodel.mapping.EntityMappingType;
4949
import org.hibernate.metamodel.mapping.EntityValuedModelPart;
5050
import org.hibernate.metamodel.mapping.EntityVersionMapping;
51+
import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
5152
import org.hibernate.metamodel.mapping.ModelPart;
5253
import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
5354
import org.hibernate.persister.entity.EntityPersister;
@@ -85,7 +86,6 @@
8586
import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
8687
import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
8788
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
88-
import static org.hibernate.metamodel.mapping.ForeignKeyDescriptor.Nature.TARGET;
8989
import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
9090

9191
/**
@@ -933,9 +933,8 @@ public void resolveInstance(Object instance, EntityInitializerData data) {
933933
if ( data.entityHolder == null ) {
934934
// Entity was most probably removed in the same session without setting the reference to null
935935
resolveKey( data );
936-
assert data.getState() == State.MISSING;
937-
assert referencedModelPart instanceof ToOneAttributeMapping
938-
&& ( (ToOneAttributeMapping) referencedModelPart ).getSideNature() == TARGET;
936+
assert referencedModelPart instanceof ToOneAttributeMapping toOneAttributeMapping
937+
&& toOneAttributeMapping.getSideNature() == ForeignKeyDescriptor.Nature.KEY;
939938
return;
940939
}
941940
if ( data.concreteDescriptor.getBytecodeEnhancementMetadata().isEnhancedForLazyLoading()

0 commit comments

Comments
 (0)