HybridLocalStrategy: NPE fix while canceling delegating job

Summary: ^ Reviewed By: cjhopman fbshipit-source-id: c5a8f0b81835e80e680ba1cb4b0a8c7b291928f8
facebook · Sep 28, 2021 · 239e850 · 239e850
1 parent ae5b505
commit 239e850
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/com/facebook/buck/rules/modern/builders/HybridLocalStrategy.java b/src/com/facebook/buck/rules/modern/builders/HybridLocalStrategy.java
@@ -278,6 +278,10 @@ public ListenableFuture<?> rescheduleLocally(Throwable reason) {
 
     public boolean cancelDelegateLocked(Throwable reason) {
       Verify.verify(Thread.holdsLock(this));
+      if (delegateResult == null) {
+        LOG.debug("Nothing to cancel.");
+        return false;
+      }
 
       StrategyBuildResult capturedDelegateResult = Objects.requireNonNull(delegateResult);
       if (capturedDelegateResult.getBuildResult().isDone()) {