[hibernate-commits] Hibernate SVN: r18554 - core/trunk/annotations/src/main/java/org/hibernate/cfg.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-01-14 05:18:00 -0500 (Thu, 14 Jan 2010)
New Revision: 18554

Modified:
   core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java
   core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
Log:
HHH-4796 fix NPE when an @AssociationOverride joinColumn is set but no @AssociationOverride joinTable is on a given property
Fix minor issues

Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java	2010-01-14 03:12:47 UTC (rev 18553)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java	2010-01-14 10:18:00 UTC (rev 18554)
@@ -199,7 +199,7 @@
 	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 @@
 	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 ) {

Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java	2010-01-14 03:12:47 UTC (rev 18553)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java	2010-01-14 10:18:00 UTC (rev 18554)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -893,7 +893,7 @@
 				}
 				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);
 				}
 
 			}