From 51284b5243052dfd7951cad3276dbcc09d78fefe Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Sat, 10 May 2008 22:02:17 +0000
Subject: Fix binding of filters which already contain some bound properties.

---
 src/main/java/com/amazon/carbonado/qe/StandardQuery.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado/qe')

diff --git a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java
index 1bb03be..e2081d6 100644
--- a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java
+++ b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java
@@ -220,7 +220,8 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S>
     private Query<S> buildAfter(S start, OrderingList<S> orderings) throws FetchException {
         Class<S> storableType = getStorableType();
         Filter<S> orderFilter = Filter.getClosedFilter(storableType);
-        Filter<S> lastSubFilter = Filter.getOpenFilter(storableType);
+        Filter<S> openFilter = Filter.getOpenFilter(storableType);
+        Filter<S> lastSubFilter = openFilter;
 
         Object[] values = new Object[orderings.size()];
 
@@ -240,7 +241,8 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S>
                 break;
             }
 
-            lastSubFilter = lastSubFilter.and(propertyName, RelOp.EQ).bind();
+            Filter<S> propFilter = openFilter.and(propertyName, RelOp.EQ).bind();
+            lastSubFilter = lastSubFilter.and(propFilter);
         }
 
         Query<S> query = this.and(orderFilter);
-- 
cgit v1.2.3