HHH-19585 Object relationship mapping issues | java.lang.NullPointerException: Cannot invoke java.lang.Comparable.compareTo(Object) because 'one' is null

Author: dreab8

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

@@ -6,12 +6,17 @@
  */
 package org.hibernate.sql.results.graph;
 
+
+import org.hibernate.Hibernate;
+
 /**
  * Provides access to information about the owner/parent of a fetch
  * in relation to the current "row" being processed.
  *
  * @author Steve Ebersole
  */
 public interface InitializerParent<Data extends InitializerData> extends Initializer<Data> {
-
+	default Object getResolvedInstanceNoProxy(Data data){
+		return Hibernate.unproxy( getResolvedInstance( data ) );
+	}
 }

hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableInitializerImpl.java

@@ -481,7 +481,7 @@ private void prepareCompositeInstance(EmbeddableInitializerData data) {
 		if ( parent != null && embedded instanceof VirtualModelPart && !isPartOfKey && data.getState() != State.MISSING ) {
 			final InitializerData subData = parent.getData( data.getRowProcessingState() );
 			parent.resolveInstance( subData );
-			data.setInstance( parent.getResolvedInstance( subData ) );
+			data.setInstance( parent.getResolvedInstanceNoProxy( subData ) );
 			if ( data.getState() == State.INITIALIZED ) {
 				return;
 			}

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

@@ -1794,6 +1794,11 @@ public String toString() {
 		return "EntityJoinedFetchInitializer(" + LoggingHelper.toLoggableString( getNavigablePath() ) + ")";
 	}
 
+	@Override
+	public Object getResolvedInstanceNoProxy(EntityInitializerData data) {
+		return data.entityInstanceForNotify;
+	}
+
 	//#########################
 	// For Hibernate Reactive
 	//#########################