Dev mode: add null checks to TimestampSet.isRestartNeeded()

- we observed NPE in some edge cases during live reload (cherry picked from commit 3fb7924)
quarkusio · Dec 18, 2023 · 8f27523 · 8f27523
1 parent 9580343
commit 8f27523
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -1309,12 +1309,14 @@ boolean isRestartNeeded(String changedFile) {
                 }
             }
             // Then try to match a new file that was added to a resource root
-            Boolean ret = watchedFilePaths.get(changedFile);
+            Boolean ret = watchedFilePaths != null ? watchedFilePaths.get(changedFile) : null;
             if (ret == null) {
-                ret = false;
-                for (Entry<Predicate<String>, Boolean> e : watchedFilePredicates) {
-                    if (e.getKey().test(changedFile)) {
-                        ret = ret || e.getValue();
+                ret = Boolean.FALSE;
+                if (watchedFilePredicates != null) {
+                    for (Entry<Predicate<String>, Boolean> e : watchedFilePredicates) {
+                        if (e.getKey().test(changedFile)) {
+                            ret = ret || e.getValue();
+                        }
                     }
                 }
             }