HHH-5578 implement a cleaner version of getPropertyOverriddenByMapperOrMapsId in the SpecJ case
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20768 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
parent
3b3c8bc923
commit
c21ea5e3e1
|
@ -682,14 +682,11 @@ public class BinderHelper {
|
|||
}
|
||||
if ( propertyHolder.isInIdClass() ) {
|
||||
PropertyData pd = mappings.getPropertyAnnotatedWithIdAndToOne( persistentXClass, propertyName );
|
||||
if ( pd == null ) {
|
||||
String propertyPath = isId ? "" : propertyName;
|
||||
return mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyPath );
|
||||
if ( pd == null && System.getProperty( "hibernate.enable_specj_proprietary_syntax" ) != null ) {
|
||||
pd = mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyName );
|
||||
}
|
||||
else {
|
||||
return pd;
|
||||
}
|
||||
}
|
||||
else {
|
||||
String propertyPath = isId ? "" : propertyName;
|
||||
return mappings.getPropertyAnnotatedWithMapsId( persistentXClass, propertyPath );
|
||||
|
|
Loading…
Reference in New Issue