commit 7a3fe523b678f4e3384363e4e3fd1470cfd3d70a
author Ulf Adams <ulfjack@google.com> Fri Dec 04 10:48:56 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Fri Dec 04 21:06:27 2015 +0000
tree 92f6fd7dc065a7a78e2cba16ce16e6a7b6bc181a
parent 77ee239a9c231adc5b492a40444db50e29cd3d17

Refactoring: pull out the call to update buildResult.

Also remove the unnecessary state check.

--
MOS_MIGRATED_REVID=109396856

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index b50317b..7e8795f 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -468,11 +468,11 @@
       }
 
       try (AutoProfiler p = AutoProfiler.profiled("Show results", ProfilerTask.INFO)) {
-        determineSuccessfulTargets(buildResult, configuredTargets, builtTargets, timer);
+        buildResult.setSuccessfulTargets(
+            determineSuccessfulTargets(configuredTargets, builtTargets, timer));
         BuildResultPrinter buildResultPrinter = new BuildResultPrinter(env);
         buildResultPrinter.showBuildResult(
             request, buildResult, configuredTargets, analysisResult.getAspects());
-        Preconditions.checkNotNull(buildResult.getSuccessfulTargets());
       }
 
       try (AutoProfiler p = AutoProfiler.profiled("Show artifacts", ProfilerTask.INFO)) {
@@ -633,7 +633,7 @@
    *                          built.
    * @param timer A timer that was started when the execution phase started.
    */
-  private void determineSuccessfulTargets(BuildResult result,
+  private Collection<ConfiguredTarget> determineSuccessfulTargets(
       Collection<ConfiguredTarget> configuredTargets, Set<ConfiguredTarget> builtTargets,
       Stopwatch timer) {
     // Maintain the ordering by copying builtTargets into a LinkedHashSet in the same iteration
@@ -646,7 +646,7 @@
     }
     env.getEventBus().post(
         new ExecutionPhaseCompleteEvent(timer.stop().elapsed(TimeUnit.MILLISECONDS)));
-    result.setSuccessfulTargets(successfulTargets);
+    return successfulTargets;
   }