Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12842 : Remove invalid workaround from ea77c1f for isNullable regression from 2bfe300 

(cherry picked from commit 8535adc057)
This commit is contained in:
Jan-Willem Gmelig Meyling 2018-10-25 12:22:19 +02:00 committed by gbadner
parent b53ce90255
commit 7e73de1cc9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractPropertyMapping.java
View File

@ -386,7 +386,7 @@ public abstract class AbstractPropertyMapping implements PropertyMapping {
}
}
if ( idPropName != null ) {
if ( (! etype.isNullable() ) && idPropName != null ) {
String idpath2 = extendPath( path, idPropName );
addPropertyPath( idpath2, idtype, columns, columnReaders, columnReaderTemplates, null, factory );
initPropertyPaths( idpath2, idtype, columns, columnReaders, columnReaderTemplates, null, factory );

2
hibernate-core/src/main/java/org/hibernate/type/EntityType.java
View File

@ -659,7 +659,7 @@ public abstract class EntityType extends AbstractType implements AssociationType
}
}
protected abstract boolean isNullable();
public abstract boolean isNullable();
/**
* Resolve an identifier via a load.

2
hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
View File

@ -109,7 +109,7 @@ public class ManyToOneType extends EntityType {
}
@Override
protected boolean isNullable() {
public boolean isNullable() {
return ignoreNotFound;
}