aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2016-06-23 13:33:11 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-06-23 13:54:24 +0000
commitd721ec92182661a9544f452862cc5787542a2765 (patch)
treeb65076f1a21c68f846116d455a97fb126f0f2df7 /src/main
parentc7f5f5157c2b03fe6fbe46441ae04905ceb6b617 (diff)
*** Reason for rollback *** This breaks the Bazel build because "putMappedXmlValue" does not exist. See: http://ci.bazel.io/view/Bazel%20bootstrap%20and%20maintenance/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=linux-x86_64/616/console -- MOS_MIGRATED_REVID=125671091
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/remote/MemcacheWorkExecutor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/MemcacheWorkExecutor.java b/src/main/java/com/google/devtools/build/lib/remote/MemcacheWorkExecutor.java
index a2948bad84..04c3c3f1d2 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/MemcacheWorkExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/MemcacheWorkExecutor.java
@@ -151,7 +151,7 @@ public class MemcacheWorkExecutor implements RemoteWorkExecutor {
}
work.addAllArguments(arguments);
- work.putAllEnvironment(environment);
+ work.getMutableEnvironment().putAll(environment);
for (ActionInput output : outputs) {
work.addOutputFilesBuilder().setPath(output.getExecPathString());
}