🐛 guard against NPE when error checking

commonhaus · Jun 8, 2024 · 394a140 · 394a140
1 parent b4eb7d4
commit 394a140
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/bot-github-core/src/main/java/org/commonhaus/automation/github/context/QueryContext.java b/bot-github-core/src/main/java/org/commonhaus/automation/github/context/QueryContext.java
@@ -150,8 +150,13 @@ public Throwable bundleExceptions() {
 
     public boolean hasNotFound() {
         return exceptions.stream().anyMatch(e -> e instanceof GHFileNotFoundException)
-                || errors.stream().anyMatch(e -> e.getOtherFields().containsKey("type")
-                        && e.getOtherFields().get("type").equals("NOT_FOUND"));
+                || errors.stream().anyMatch(e -> hasFieldError(e, "NOT_FOUND"));
+    }
+
+    private boolean hasFieldError(GraphQLError e, String message) {
+        var others = e.getOtherFields();
+        var type = others == null ? null : others.get("type");
+        return message.equals(type);
     }
 
     public boolean clearNotFound() {