[hibernate-commits] Hibernate SVN: r10926 - branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-12-05 13:48:42 -0500 (Tue, 05 Dec 2006)
New Revision: 10926

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/PersistentClass.java
Log:
HHH-2282 : PersistentClass propetty lookups and embedded composite identifiers;
consolidate property-ref tests

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/PersistentClass.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/PersistentClass.java	2006-12-05 18:47:50 UTC (rev 10925)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/PersistentClass.java	2006-12-05 18:48:42 UTC (rev 10926)
@@ -374,12 +374,17 @@
 					}
 					else if ( identifierProperty == null && getIdentifier() != null && Component.class.isInstance( getIdentifier() ) ) {
 						// we have an embedded composite identifier
-						identifierProperty = getProperty( element, ( ( Component ) getIdentifier() ).getPropertyIterator() );
-						if ( identifierProperty != null ) {
-							// the root of the incoming property path matched one
-							// of the embedded composite identifier properties
-							property = identifierProperty;
+						try {
+							identifierProperty = getProperty( element, ( ( Component ) getIdentifier() ).getPropertyIterator() );
+							if ( identifierProperty != null ) {
+								// the root of the incoming property path matched one
+								// of the embedded composite identifier properties
+								property = identifierProperty;
+							}
 						}
+						catch( MappingException ignore ) {
+							// ignore it...
+						}
 					}
 
 					if ( property == null ) {