From c14b35c901c8f5b53b27918f7e9bb22f36b7c93e Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulfjack@google.com>
Date: Mon, 28 Sep 2015 15:29:07 +0000
Subject: BlazeRuntime.reporter is now null in production.

--
MOS_MIGRATED_REVID=104102106
---
 .../java/com/google/devtools/build/lib/runtime/BlazeRuntime.java    | 6 +++---
 .../com/google/devtools/build/lib/runtime/CommandEnvironment.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index c4eff23ce1..026b2cf3e7 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -50,6 +50,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFactory;
 import com.google.devtools.build.lib.analysis.config.DefaultsPackage;
 import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.OutputFilter;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.exec.OutputService;
@@ -858,13 +859,13 @@ public final class BlazeRuntime {
    *
    * @see DefaultsPackage
    */
-  public void setupPackageCache(PackageCacheOptions packageCacheOptions,
+  public void setupPackageCache(EventHandler eventHandler, PackageCacheOptions packageCacheOptions,
       String defaultsPackageContents, UUID commandId)
           throws InterruptedException, AbruptExitException {
     if (!skyframeExecutor.hasIncrementalState()) {
       clearSkyframeRelevantCaches();
     }
-    skyframeExecutor.sync(reporter, packageCacheOptions, getOutputBase(), getWorkingDirectory(),
+    skyframeExecutor.sync(eventHandler, packageCacheOptions, getOutputBase(), getWorkingDirectory(),
         defaultsPackageContents, commandId);
   }
 
@@ -1463,7 +1464,6 @@ public final class BlazeRuntime {
     public BlazeRuntime build() throws AbruptExitException {
       Preconditions.checkNotNull(directories);
       Preconditions.checkNotNull(startupOptionsProvider);
-      Reporter reporter = (this.reporter == null) ? new Reporter() : this.reporter;
 
       Clock clock = (this.clock == null) ? BlazeClock.instance() : this.clock;
       UUID instanceId =  (this.instanceId == null) ? UUID.randomUUID() : this.instanceId;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 83c3cd3b34..a229e21c09 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -87,7 +87,7 @@ public final class CommandEnvironment {
       EventBus eventBus) {
     this.runtime = runtime;
     this.commandId = commandId;
-    this.reporter = reporter;
+    this.reporter = reporter == null ? new Reporter() : reporter;
     this.eventBus = eventBus;
     this.blazeModuleEnvironment = new BlazeModuleEnvironment();
     this.view = new BuildView(runtime.getDirectories(), runtime.getRuleClassProvider(),
@@ -226,7 +226,7 @@ public final class CommandEnvironment {
    */
   public void setupPackageCache(PackageCacheOptions packageCacheOptions,
       String defaultsPackageContents) throws InterruptedException, AbruptExitException {
-    runtime.setupPackageCache(packageCacheOptions, defaultsPackageContents, commandId);
+    runtime.setupPackageCache(reporter, packageCacheOptions, defaultsPackageContents, commandId);
   }
 
   public long getCommandStartTime() {
-- 
cgit v1.2.3