NPE fix

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/query/Query.java

@@ -290,23 +290,23 @@ void resolveEagerRelations(List entities) {
     }
 
     /** Note: no null check on eagerRelations! */
-    void resolveEagerRelationForNonNullEagerRelations(Object entity, int entityIndex) {
+    void resolveEagerRelationForNonNullEagerRelations(@Nonnull Object entity, int entityIndex) {
         for (EagerRelation eagerRelation : eagerRelations) {
             if (eagerRelation.limit == 0 || entityIndex < eagerRelation.limit) {
                 resolveEagerRelation(entity, eagerRelation);
             }
         }
     }
 
-    void resolveEagerRelation(Object entity) {
-        if (eagerRelations != null) {
+    void resolveEagerRelation(@Nullable Object entity) {
+        if (eagerRelations != null && entity != null) {
             for (EagerRelation eagerRelation : eagerRelations) {
                 resolveEagerRelation(entity, eagerRelation);
             }
         }
     }
 
-    void resolveEagerRelation(Object entity, EagerRelation eagerRelation) {
+    void resolveEagerRelation(@Nonnull Object entity, EagerRelation eagerRelation) {
         if (eagerRelations != null) {
             RelationInfo relationInfo = eagerRelation.relationInfo;
             if (relationInfo.toOneGetter != null) {

tests/objectbox-java-test/src/main/java/io/objectbox/relation/RelationEagerTest.java

@@ -20,6 +20,7 @@
 
 import java.util.List;
 
+import io.objectbox.query.Query;
 import io.objectbox.query.QueryConsumer;
 
 
@@ -77,6 +78,19 @@ public void accept(Customer data) {
         assertTrue(((ToMany) customer.getOrders()).isResolved());
     }
 
+    @Test
+    public void testEagerToMany_NoResult() {
+        Query<Customer> query = customerBox.query().eager(Customer_.orders).build();
+        query.find();
+        query.findFirst();
+        query.forEach(new QueryConsumer<Customer>() {
+            @Override
+            public void accept(Customer data) {
+
+            }
+        });
+    }
+
     @Test
     public void testEagerToSingle() {
         Customer customer = putCustomer();
@@ -122,4 +136,18 @@ public void accept(Customer data) {
         assertTrue(order.customer__toOne.isResolved());
     }
 
+    @Test
+    public void testEagerToSingle_NoResult() {
+        Query<Order> query = orderBox.query().eager(Order_.customer).build();
+        query.find();
+        query.findFirst();
+        query.forEach(new QueryConsumer<Order>() {
+            @Override
+            public void accept(Order data) {
+
+            }
+        });
+    }
+
+
 }