Author: epbernard
Date: 2008-07-08 09:08:34 -0400 (Tue, 08 Jul 2008)
New Revision: 14892

Modified:
 search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
Log:
use explicit criteria even on single object load

Modified: search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java  2008-07-08 13:07:44 UTC (rev 14891)
+++ search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java  2008-07-08 13:08:34 UTC (rev 14892)
@@(protected) @@
* @author Emmanuel Bernard
*/
public class QueryLoader implements Loader {
-  private final Logger log = LoggerFactory.getLogger( QueryLoader.class );

 private Session session;
 private Class entityType;
 private SearchFactoryImplementor searchFactoryImplementor;
 private Criteria criteria;
+  private boolean isExplicitCriteria;

 public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
   this.session = session;
@@(protected) @@
 }

 public Object load(EntityInfo entityInfo) {
+    //if explicit criteria, make sure to use it to load the objects
+    if ( isExplicitCriteria ) load( new EntityInfo[] { entityInfo } );
   return ObjectLoaderHelper.load( entityInfo, session );
 }

@@(protected) @@
 }

 public void setCriteria(Criteria criteria) {
+    isExplicitCriteria = criteria != null;
   this.criteria = criteria;
 }
}

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits