diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2009-04-25 18:21:06 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2009-04-25 18:21:06 +0000 |
| commit | 8b9ab0b1892477912073c0df7712d9e7520e8983 (patch) | |
| tree | 0f1cc8c78e8b8e38f109c96ab786abe7a82afaea /src/main/java/com | |
| parent | 54b03e4b3ce8ef1a294c23c4369579c7043f2287 (diff) | |
Undo change from 1114.
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/qe/StandardQuery.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java index c86a5f3..736f31f 100644 --- a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java +++ b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java @@ -163,9 +163,7 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S> if (getBlankParameterCount() > 0) {
throw new IllegalStateException("Blank parameters exist in query: " + this);
}
- // Unbind is required to ensure sub-filters with common elements
- // don't share values.
- newFilter = mFilter.unbind().and(filter);
+ newFilter = mFilter.and(filter);
newValues = newFilter.initialFilterValues();
if (mValues != null) {
newValues = newValues.withValues(mValues.getSuppliedValues());
@@ -181,9 +179,7 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S> if (getBlankParameterCount() > 0) {
throw new IllegalStateException("Blank parameters exist in query: " + this);
}
- // Unbind is required to ensure sub-filters with common elements don't
- // share values.
- Filter<S> newFilter = mFilter.unbind().or(filter);
+ Filter<S> newFilter = mFilter.or(filter);
FilterValues<S> newValues = newFilter.initialFilterValues();
if (mValues != null) {
newValues = newValues.withValues(mValues.getSuppliedValues());
|