From 46944d441290f7d31d06279f5460a4142f556493 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Tue, 16 Jul 2019 22:22:18 -0700
Subject: [PATCH] HHH-13424 : Table nullability should not depend on
 JpaCompliance.isJpaCacheComplianceEnabled()

(cherry picked from commit 18f9c142e3752cca0ebc5b595c9976a1cd6e3043)
---
 .../entity/JoinedSubclassEntityPersister.java       |  7 +------
 .../entity/SingleTableEntityPersister.java          | 13 ++-----------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
index b3f6c3eb54..a936c776f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -243,12 +243,7 @@ else if ( persistentClass.isDiscriminatorValueNotNull() ) {
 		while ( joinItr.hasNext() ) {
 			Join join = (Join) joinItr.next();
 
-			isNullableTable[tableIndex++] = join.isOptional() ||
-					creationContext.getSessionFactory()
-							.getSessionFactoryOptions()
-							.getJpaCompliance()
-							.isJpaCacheComplianceEnabled();
-
+			isNullableTable[tableIndex] = join.isOptional();
 
 			Table table = join.getTable();
 			final String tableName = determineTableName( table, jdbcEnvironment );
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
index 1afbb6b852..a5c574e453 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
@@ -178,11 +178,7 @@ public SingleTableEntityPersister(
 			Join join = (Join) joinIter.next();
 			qualifiedTableNames[j] = determineTableName( join.getTable(), jdbcEnvironment );
 			isInverseTable[j] = join.isInverse();
-			isNullableTable[j] = join.isOptional()
-					|| creationContext.getSessionFactory()
-							.getSessionFactoryOptions()
-							.getJpaCompliance()
-							.isJpaCacheComplianceEnabled();
+			isNullableTable[j] = join.isOptional();
 			cascadeDeleteEnabled[j] = join.getKey().isCascadeDeleteEnabled() &&
 					factory.getDialect().supportsCascadeDelete();
 
@@ -248,12 +244,7 @@ public SingleTableEntityPersister(
 			isConcretes.add( persistentClass.isClassOrSuperclassJoin( join ) );
 			isDeferreds.add( join.isSequentialSelect() );
 			isInverses.add( join.isInverse() );
-			isNullables.add(
-					join.isOptional() || creationContext.getSessionFactory()
-							.getSessionFactoryOptions()
-							.getJpaCompliance()
-							.isJpaCacheComplianceEnabled()
-			);
+			isNullables.add( join.isOptional() );
 			isLazies.add( lazyAvailable && join.isLazy() );
 			if ( join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin( join ) ) {
 				hasDeferred = true;