Merge pull request #97 from couchbaselabs/fix/1368-view-grouped-null-key

Hideki Itakura · web-flow · commit ffe26dd65ad0 · 2017-09-25T18:29:56.000-07:00
Fixed Android Issue 1368 - Query View group by part of null key throw…
diff --git a/src/main/java/com/couchbase/lite/store/ForestDBViewStore.java b/src/main/java/com/couchbase/lite/store/ForestDBViewStore.java
@@ -799,9 +799,10 @@ private static boolean groupTogether(Object key1, Object key2, int groupLevel) {
 
         int end = Math.min(groupLevel, Math.min(key1List.size(), key2List.size()));
         for (int i = 0; i < end; ++i) {
-            if (!key1List.get(i).equals(key2List.get(i))) {
+            if (key1List.get(i) != null && !key1List.get(i).equals(key2List.get(i)))
+                return false;
+            else if (key1List.get(i) == null && key2List.get(i) != null)
                 return false;
-            }
         }
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -799,9 +799,10 @@ private static boolean groupTogether(Object key1, Object key2, int groupLevel) {`
`799`	`799`
`800`	`800`	`int end = Math.min(groupLevel, Math.min(key1List.size(), key2List.size()));`
`801`	`801`	`for (int i = 0; i < end; ++i) {`
`802`		`- if (!key1List.get(i).equals(key2List.get(i))) {`
	`802`	`+ if (key1List.get(i) != null && !key1List.get(i).equals(key2List.get(i)))`
	`803`	`+ return false;`
	`804`	`+ else if (key1List.get(i) == null && key2List.get(i) != null)`
`803`	`805`	`return false;`
`804`		`- }`
`805`	`806`	`}`
`806`	`807`	`return true;`
`807`	`808`	`}`