diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-04-01 15:06:59 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-04-01 18:24:48 +0000 |
| commit | 494e311493c2f90ce0cc2020957245da9415fc0a (patch) | |
| tree | 3e067fe1d0ce54be1cec2ea49901b95a9fbcdfdc /src | |
| parent | c12c9392c079c874f989efa6134384efb8051610 (diff) | |
Make worker more defensive about NPEs
I was messing with filesystem dirtiness checkers and got an NPE, and I guess it
was so early in the build that the buildRequest didn't have WorkerOptions yet,
so I got a NPE from WorkerModule.buildComplete masking the actual NPE.
--
MOS_MIGRATED_REVID=118780059
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java index cde7584181..5e77542085 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java @@ -122,7 +122,9 @@ public class WorkerModule extends BlazeModule { @Subscribe public void buildComplete(BuildCompleteEvent event) { - if (workers != null && buildRequest.getOptions(WorkerOptions.class).workerQuitAfterBuild) { + if (workers != null && buildRequest != null + && buildRequest.getOptions(WorkerOptions.class) != null + && buildRequest.getOptions(WorkerOptions.class).workerQuitAfterBuild) { if (verbose) { env .getReporter() |