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

HHH-4796 fix NPE when an @AssociationOverride joinColumn is set but no @AssociationOverride joinTable is on a given property 

Fix minor issues

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18554 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Emmanuel Bernard 2010-01-14 10:18:00 +00:00
parent 79bb60ea89
commit b520a4a11e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java
View File

@ -199,7 +199,7 @@ public abstract class AbstractPropertyHolder implements PropertyHolder {
private JoinColumn[] getExactOverriddenJoinColumn(String propertyName) {
JoinColumn[] override = null;
if ( parent != null ) {
override = parent.getOverriddenJoinColumn( propertyName );
override = parent.getExactOverriddenJoinColumn( propertyName );
}
if ( override == null && currentPropertyJoinColumnOverride != null ) {
override = currentPropertyJoinColumnOverride.get( propertyName );
@ -249,9 +249,9 @@ public abstract class AbstractPropertyHolder implements PropertyHolder {
private JoinTable getExactOverriddenJoinTable(String propertyName) {
JoinTable override = null;
if ( parent != null ) {
override = parent.getOverriddenJoinTable( propertyName );
override = parent.getExactOverriddenJoinTable( propertyName );
}
if ( override == null && currentPropertyJoinColumnOverride != null ) {
if ( override == null && currentPropertyJoinTableOverride != null ) {
override = currentPropertyJoinTableOverride.get( propertyName );
}
if ( override == null && holderJoinTableOverride != null ) {

4
annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
View File

@ -1,4 +1,4 @@
// $Id:$
// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
@ -893,7 +893,7 @@ public class AnnotationConfiguration extends Configuration {
}
catch ( DocumentException e ) {
//oops asXML fails even if the core doc parses initially
new AssertionFailure("Error in DOM4J leads to a bug in Hibernate", e);
throw new AssertionFailure("Error in DOM4J leads to a bug in Hibernate", e);
}
}