[Hibernate-commits] Hibernate Code SVN: r10036 - trunk/Hibernate3/src/org/hibernate/loader/custom

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

Author: ste...@jb...
Date: 2006-06-21 15:42:52 -0400 (Wed, 21 Jun 2006)
New Revision: 10036

Modified:
   trunk/Hibernate3/src/org/hibernate/loader/custom/CustomLoader.java
Log:
2 minor bugs in "auto discovery"

Modified: trunk/Hibernate3/src/org/hibernate/loader/custom/CustomLoader.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/loader/custom/CustomLoader.java	2006-06-21 18:39:42 UTC (rev 10035)
+++ trunk/Hibernate3/src/org/hibernate/loader/custom/CustomLoader.java	2006-06-21 19:42:52 UTC (rev 10036)
@@ -96,6 +96,8 @@
 			final Return rtn = ( Return ) itr.next();
 			if ( rtn instanceof ScalarReturn ) {
 				ScalarReturn scalarRtn = ( ScalarReturn ) rtn;
+				resultTypes.add( scalarRtn.getType() );
+				specifiedAliases.add( scalarRtn.getColumnAlias() );
 				resultColumnProcessors.add(
 						new ScalarResultColumnProcessor(
 								scalarRtn.getColumnAlias(),
@@ -103,8 +105,6 @@
 						        resultTypes.size()
 						)
 				);
-				resultTypes.add( scalarRtn.getType() );
-				specifiedAliases.add( scalarRtn.getColumnAlias() );
 				hasScalars = true;
 			}
 			else if ( rtn instanceof RootReturn ) {
@@ -450,7 +450,6 @@
 		}
 
 		public void performDiscovery(ResultSetMetaData resultSetMetaData, List types, List aliases) {
-			throw new HibernateException( "cannot perform autodiscovery on queries with non-scalar results" );
 		}
 
 	}