[hibernate-commits] Hibernate SVN: r10855 - branches/Branch_3_2/Hibernate3/src/org/hibernate/impl

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-11-21 16:57:32 -0500 (Tue, 21 Nov 2006)
New Revision: 10855

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/AbstractQueryImpl.java
Log:
HHH-2250 : Query.setEntity() with null entity

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/AbstractQueryImpl.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/AbstractQueryImpl.java	2006-11-21 17:42:48 UTC (rev 10854)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/AbstractQueryImpl.java	2006-11-21 21:57:32 UTC (rev 10855)
@@ -531,10 +531,17 @@
 	}
 
 	public Query setEntity(int position, Object val) {
-		setParameter( position, val, Hibernate.entity( session.bestGuessEntityName(val) ) );
+		setParameter( position, val, Hibernate.entity( resolveEntityName( val ) ) );
 		return this;
 	}
 
+	private String resolveEntityName(Object val) {
+		if ( val == null ) {
+			throw new IllegalArgumentException( "entity for parameter binding cannot be null" );
+		}
+		return session.bestGuessEntityName( val );
+	}
+
 	public Query setLocale(int position, Locale locale) {
 		setParameter(position, locale, Hibernate.LOCALE);
 		return this;
@@ -588,7 +595,7 @@
 	}
 
 	public Query setEntity(String name, Object val) {
-		setParameter( name, val, Hibernate.entity( session.bestGuessEntityName(val) ) );
+		setParameter( name, val, Hibernate.entity( resolveEntityName( val ) ) );
 		return this;
 	}