[hibernate-commits] Hibernate SVN: r13958 - in search/trunk/src: test/org/hibernate/search/test/filter and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-08-29 12:26:07 -0400 (Wed, 29 Aug 2007)
New Revision: 13958

Added:
   search/trunk/src/test/org/hibernate/search/test/filter/Soap.java
Modified:
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java
Log:
HSEARCH-112 filterDef definitions are erased when more than one class is mapped

Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	2007-08-29 00:50:12 UTC (rev 13957)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	2007-08-29 16:26:07 UTC (rev 13958)
@@ -67,7 +67,7 @@
 	private Worker worker;
 	private ReaderProvider readerProvider;
 	private BackendQueueProcessorFactory backendQueueProcessorFactory;
-	private Map<String, FilterDef> filterDefinitions;
+	private Map<String, FilterDef> filterDefinitions = new HashMap<String, FilterDef>();
 	private FilterCachingStrategy filterCachingStrategy;
 
 	/**
@@ -103,7 +103,6 @@
 	}
 
 	private void bindFilterDefs(XClass mappedXClass) {
-		filterDefinitions = new HashMap<String, FilterDef>();
 		FullTextFilterDef defAnn = mappedXClass.getAnnotation( FullTextFilterDef.class );
 		if ( defAnn != null ) {
 			bindFilterDef( defAnn, mappedXClass );

Modified: search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java	2007-08-29 00:50:12 UTC (rev 13957)
+++ search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java	2007-08-29 16:26:07 UTC (rev 13958)
@@ -131,7 +131,8 @@
 
 	protected Class[] getMappings() {
 		return new Class[] {
-				Driver.class
+				Driver.class,
+				Soap.class
 		};
 	}
 }

Added: search/trunk/src/test/org/hibernate/search/test/filter/Soap.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/filter/Soap.java	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/filter/Soap.java	2007-08-29 16:26:07 UTC (rev 13958)
@@ -0,0 +1,38 @@
+//$Id$
+package org.hibernate.search.test.filter;
+
+import javax.persistence.Id;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+
+import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Field;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Soap {
+	@Id @DocumentId
+	@GeneratedValue
+	private Integer id;
+
+	@Field
+	private String perfume;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getPerfume() {
+		return perfume;
+	}
+
+	public void setPerfume(String perfume) {
+		this.perfume = perfume;
+	}
+}