Null Handling

dimagi · Dec 5, 2024 · 10f3548 · 10f3548
1 parent 36bbe67
commit 10f3548
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/src/org/commcare/tasks/EntityLoaderHelper.kt b/app/src/org/commcare/tasks/EntityLoaderHelper.kt
@@ -38,12 +38,15 @@ class EntityLoaderHelper(
     /**
      * Loads and prepares a list of entities derived from the given nodeset
      */
-    fun loadEntities(nodeset: TreeReference): Pair<List<Entity<TreeReference>>, List<TreeReference>> {
+    fun loadEntities(nodeset: TreeReference): Pair<List<Entity<TreeReference>>, List<TreeReference>>? {
         val references = factory.expandReferenceList(nodeset)
         val entities = loadEntitiesWithReferences(references)
-        factory.prepareEntities(entities)
-        factory.printAndClearTraces("build")
-        return Pair<List<Entity<TreeReference>>, List<TreeReference>>(entities, references)
+        entities?.let {
+            factory.prepareEntities(entities)
+            factory.printAndClearTraces("build")
+            return Pair<List<Entity<TreeReference>>, List<TreeReference>>(entities, references)
+        }
+        return null
     }
 
 

diff --git a/app/src/org/commcare/tasks/EntityLoaderTask.java b/app/src/org/commcare/tasks/EntityLoaderTask.java
@@ -59,6 +59,10 @@ protected void onPostExecute(Pair<List<Entity<TreeReference>>, List<TreeReferenc
                         return;
                     }
 
+                    if (result == null) {
+                        return;
+                    }
+
                     listener.deliverLoadResult(result.first, result.second, entityLoaderHelper.getFactory(),
                             entityLoaderHelper.getFocusTargetIndex());
                     return;
-Original file line number
+Diff line change
@@ Expand Up @@
                             return;
                         }
+                        if (result == null) {
+                            return;
+                        }
                         listener.deliverLoadResult(result.first, result.second, entityLoaderHelper.getFactory(),
                                 entityLoaderHelper.getFocusTargetIndex());
                         return;
@@ Expand Down @@