[hibernate-commits] Hibernate SVN: r15554 - in search/trunk/src/java/org/hibernate/search: query and 1 other directory.
Author: hardy.ferentschik
Date: 2008-11-12 11:37:50 -0500 (Wed, 12 Nov 2008)
New Revision: 15554
Modified:
search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java
search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
Log:
HSEARCH-224
Pass along the filter classes to MultiClassesQueryLoader
Modified: search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java 2008-11-12
15:01:44 UTC (rev 15553)
+++ search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java 2008-11-12
16:37:50 UTC (rev 15554)
@@ -21,6 +21,7 @@
private Boolean projectThis;
private ResultTransformer transformer;
private String[] aliases;
+ private Class[] entityTypes;
public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
this.session = session;
@@ -33,6 +34,10 @@
this.aliases = aliases;
}
+ public void setEntityTypes(Class[] entityTypes) {
+ this.entityTypes = entityTypes;
+ }
+
public Object load(EntityInfo entityInfo) {
initThisProjectionFlag( entityInfo );
if ( projectThis ) {
@@ -54,7 +59,7 @@
if ( projectThis ) {
MultiClassesQueryLoader loader = new MultiClassesQueryLoader();
loader.init( session, searchFactoryImplementor );
- loader.setEntityTypes( new Class[]{} );
+ loader.setEntityTypes( entityTypes );
objectLoader = loader;
}
}
Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-11-12
15:01:44 UTC (rev 15553)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-11-12
16:37:50 UTC (rev 15554)
@@ -164,6 +164,7 @@
if ( indexProjection != null ) {
ProjectionLoader loader = new ProjectionLoader();
loader.init( session, searchFactoryImplementor, resultTransformer, indexProjection );
+ loader.setEntityTypes( classes );
return loader;
}
if ( criteria != null ) {