From b4fc65d11f2100cdaaa750cad29dfb7db5192798 Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Mon, 6 Aug 2007 00:49:18 +0000
Subject: Support filters as joined and not joined from one-to-many properties.

---
 src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
index d947ed7..b1d47e9 100644
--- a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
+++ b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
@@ -395,7 +395,12 @@ public class JoinedQueryExecutor<S extends Storable, T extends Storable>
     private static <T extends Storable> OrderingList<T>
         expectedOrdering(StorageAccess<T> access, Filter<T> filter, OrderingList<T> ordering)
     {
-        List<Filter<T>> split = filter.disjunctiveNormalFormSplit();
+        List<Filter<T>> split;
+        if (filter == null) {
+            split = Filter.getOpenFilter(access.getStorableType()).disjunctiveNormalFormSplit();
+        } else {
+            split = filter.disjunctiveNormalFormSplit();
+        }
 
         Comparator comparator = CompositeScore.fullComparator();
 
-- 
cgit v1.2.3