commit 32bf17e1240b607a720eb8ebf40e13c8b2264b7b
author Googler <larsrc@google.com> Fri Dec 09 00:38:12 2022 -0800
committer fweikert <fwe@google.com> Wed Dec 14 19:29:52 2022 +0100
tree dc487a7214186c1f3c271a6d99880ab53ee2286b
parent f0ae6a93a14c7a9a3fcccc1ca03c13c714554bb5

Fix NPE in signal ignoring logic.

Turns out the special default "null" gets turned into a null even before running the converter. Grr.

PiperOrigin-RevId: 494101769
Change-Id: Ieb1746094f53fddbbedbd18dabc1a6784973ed86

src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java

diff --git a/src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java b/src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java
index 1e342c9..3e9ad8d 100644
--- a/src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java
+++ b/src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionModule.java
@@ -81,7 +81,9 @@
     DynamicExecutionOptions dynamicOptions =
         env.getOptions().getOptions(DynamicExecutionOptions.class);
     ignoreLocalSignals =
-        dynamicOptions != null ? dynamicOptions.ignoreLocalSignals : ImmutableSet.of();
+        dynamicOptions != null && dynamicOptions.ignoreLocalSignals != null
+            ? dynamicOptions.ignoreLocalSignals
+            : ImmutableSet.of();
     reporter = env.getReporter();
   }