HHH-10314 Don't create the batch fetch queue to remove entities, as a null queue cannot contain the entity

Author: stuartwdouglas

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -383,7 +383,9 @@ public Object[] getCachedDatabaseSnapshot(EntityKey key) {
 	@Override
 	public void addEntity(EntityKey key, Object entity) {
 		entitiesByKey.put( key, entity );
-		getBatchFetchQueue().removeBatchLoadableEntityKey( key );
+		if( batchFetchQueue != null ) {
+			getBatchFetchQueue().removeBatchLoadableEntityKey(key);
+		}
 	}
 
 	@Override
@@ -409,8 +411,10 @@ public Object removeEntity(EntityKey key) {
 		parentsByChild.clear();
 		entitySnapshotsByKey.remove( key );
 		nullifiableEntityKeys.remove( key );
-		getBatchFetchQueue().removeBatchLoadableEntityKey( key );
-		getBatchFetchQueue().removeSubselect( key );
+		if( batchFetchQueue != null ) {
+			getBatchFetchQueue().removeBatchLoadableEntityKey(key);
+			getBatchFetchQueue().removeSubselect(key);
+		}
 		return entity;
 	}