Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7233 - unmuck EntityManager#getSingleResult wrt auto-setting of max results 

(cherry picked from commit 4785d7eb2e)
This commit is contained in:
Steve Ebersole 2012-11-26 10:34:59 -06:00
parent 70e7a1ff40
commit b8b865e46a
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
View File

@ -280,19 +280,7 @@ public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> impleme
@SuppressWarnings({ "unchecked", "RedundantCast" }) @SuppressWarnings({ "unchecked", "RedundantCast" })
public X getSingleResult() { public X getSingleResult() {
try { try {
boolean mucked = false; final List<X> result = query.list();
// IMPL NOTE : the mucking with max results here is attempting to help the user from shooting themselves
// in the foot in the case where they have a large query by limiting the query results to 2 max
// SQLQuery cannot be safely paginated, leaving the user's choice here.
if ( getSpecifiedMaxResults() != 1 &&
! ( SQLQuery.class.isAssignableFrom( query.getClass() ) ) ) {
mucked = true;
query.setMaxResults( 2 ); //avoid OOME if the list is huge
}
List<X> result = query.list();
if ( mucked ) {
query.setMaxResults( getSpecifiedMaxResults() );
}
if ( result.size() == 0 ) { if ( result.size() == 0 ) {
NoResultException nre = new NoResultException( "No entity found for query" ); NoResultException nre = new NoResultException( "No entity found for query" );
@ -300,7 +288,7 @@ public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> impleme
throw nre; throw nre;
} }
else if ( result.size() > 1 ) { else if ( result.size() > 1 ) {
Set<X> uniqueResult = new HashSet<X>(result); final Set<X> uniqueResult = new HashSet<X>(result);
if ( uniqueResult.size() > 1 ) { if ( uniqueResult.size() > 1 ) {
NonUniqueResultException nure = new NonUniqueResultException( "result returns more than one elements" ); NonUniqueResultException nure = new NonUniqueResultException( "result returns more than one elements" );
getEntityManager().handlePersistenceException( nure ); getEntityManager().handlePersistenceException( nure );
@ -309,7 +297,6 @@ public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> impleme
else { else {
return uniqueResult.iterator().next(); return uniqueResult.iterator().next();
} }
} }
else { else {
return result.get( 0 ); return result.get( 0 );