HHH-11903 : @OnetoOne Derived ID is null when returned by query when …

…bidirectional

(cherry picked from commit 4741fa4)

hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java

@@ -13,6 +13,7 @@
 import javax.persistence.JoinColumns;
 
 import org.hibernate.AnnotationException;
+import org.hibernate.FetchMode;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.LazyGroup;
 import org.hibernate.annotations.common.reflection.XClass;
@@ -236,10 +237,15 @@ else if ( otherSideProperty.getValue() instanceof ManyToOne ) {
 				boolean referenceToPrimaryKey  = referencesDerivedId || mappedBy == null;
 				value.setReferenceToPrimaryKey( referenceToPrimaryKey );
 
-				// If the other side is a derived ID, prevent an infinite
-				// loop of attempts to resolve identifiers.
-				if ( referencesDerivedId ) {
-					( (ManyToOne) otherSideProperty.getValue() ).setReferenceToPrimaryKey( false );
+				// If the other side is a derived ID, and both sides are eager using FetchMode.JOIN,
+				// prevent an infinite loop of attempts to resolve identifiers by making
+				// this side use FetchMode.SELECT.
+				if ( referencesDerivedId &&
+						!value.isLazy() &&
+						value.getFetchMode() == FetchMode.JOIN &&
+						!otherSideProperty.isLazy() &&
+						otherSideProperty.getValue().getFetchMode() == FetchMode.JOIN ) {
+					value.setFetchMode( FetchMode.SELECT );
 				}
 
 				String propertyRef = value.getReferencedPropertyName();

hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java

@@ -25,9 +25,7 @@
 
 public class OneToOneWithDerivedIdentityTest extends BaseCoreFunctionalTestCase {
 	@Test
-	//@TestForIssue(jiraKey = "HHH-5695")
 	@TestForIssue(jiraKey = "HHH-11903")
-	@FailureExpected(jiraKey = "HHH-11903")
 	public void testInsertFooAndBarWithDerivedId() {
 		Session s = openSession();
 		s.beginTransaction();