[Hibernate-commits] Hibernate Code SVN: r9867 - in trunk: Hibernate3/src/org/hibernate/cfg HibernateExt/metadata/src/java/org/hibernate/cfg

[<hib...@li...>]

Author: epbernard
Date: 2006-05-03 22:16:10 -0400 (Wed, 03 May 2006)
New Revision: 9867

Modified:
   trunk/Hibernate3/src/org/hibernate/cfg/Mappings.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java
Log:
ANN-337

Modified: trunk/Hibernate3/src/org/hibernate/cfg/Mappings.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/cfg/Mappings.java	2006-05-03 23:20:46 UTC (rev 9866)
+++ trunk/Hibernate3/src/org/hibernate/cfg/Mappings.java	2006-05-04 02:16:10 UTC (rev 9867)
@@ -40,7 +40,7 @@
 	private final Map tables;
 	private final Map queries;
 	private final Map sqlqueries;
-	private final Map resultSetMappings;
+	protected final Map resultSetMappings;
 	private final Map typeDefs;
 	private final List secondPasses;
 	private final Map imports;

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java	2006-05-03 23:20:46 UTC (rev 9866)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java	2006-05-04 02:16:10 UTC (rev 9867)
@@ -235,12 +235,13 @@
 	}
 
 	public void addDefaultResultSetMapping(ResultSetMappingDefinition definition) {
-		if ( ! defaultSqlResulSetMappingNames.contains( definition.getName() )
-				&& super.getResultSetMapping( definition.getName() ) != null ) {
-			//FIXME overrides without clashing when resultSetMAppings visibility allows it
+		final String name = definition.getName();
+		if ( ! defaultSqlResulSetMappingNames.contains( name )
+				&& super.getResultSetMapping( name ) != null ) {
+			resultSetMappings.remove( name );
 		}
 		super.addResultSetMapping(definition);
-		defaultSqlResulSetMappingNames.add( definition.getName() );
+		defaultSqlResulSetMappingNames.add( name );
 	}
 
 	@Override