Merge pull request #234 from tonjo/master

Fixing chaining filter problem -> check to avoid NoneType bitwise and operation
scholrly · Jan 29, 2014 · 88db672 · 88db672
2 parents 3c36c15 + 681dfdf
commit 88db672
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/neo4django/db/models/query.py b/neo4django/db/models/query.py
@@ -909,7 +909,8 @@ def as_groovy(self, using):
         index_qs_dict = {}
         for key, val in index_qs:
             if key in index_qs_dict:
-                index_qs_dict[key] &= val
+                if index_qs_dict[key]:
+                    index_qs_dict[key] &= val
             else:
                 index_qs_dict[key] = val