X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.acr%2Fsrc%2Forg%2Fargeo%2Fapi%2Facr%2Fsearch%2FBasicSearch.java;h=7aae8cca07721df4cc8a40b819e75eab2d743995;hb=HEAD;hp=8cbdebf7e5d5c8e6614dea460a739e59328158d1;hpb=5724ab347ddfba8f2b21cdcc2fa0b8e1e2b4e527;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java b/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
index 8cbdebf7e..7aae8cca0 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/search/BasicSearch.java
@@ -57,11 +57,11 @@ public class BasicSearch {
 	}
 
 	public BasicSearch where(Consumer<AndFilter> and) {
-		if (where != null)
-			throw new IllegalStateException("A where clause is already set");
-		AndFilter subFilter = new AndFilter();
-		and.accept(subFilter);
-		where = subFilter;
+//		if (where != null)
+//			throw new IllegalStateException("A where clause is already set");
+//		AndFilter subFilter = new AndFilter();
+		and.accept((AndFilter) getWhere());
+//		where = subFilter;
 		return this;
 	}
 
@@ -74,6 +74,8 @@ public class BasicSearch {
 	}
 
 	public ContentFilter<? extends Composition> getWhere() {
+		if (where == null)
+			where = new AndFilter();
 		return where;
 	}