commit aff84c4b2ef82fa18b3e8616b8a2dcd6b38d6937
author Benjamin Peterson <bp@benjamin.pe> Mon Jun 24 05:37:02 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 24 05:37:52 2019 -0700
tree 8a988c1171c2827edf782e557f63e166335fafbc
parent 13bf21bdb727adb1a9889b13d0cac6aa77a41bbc

Exchange "old" and "new" worker hashes in the debugging message.

In this code, the worker we're validating has the "old" hashes and the worker key has the "new" hashes.

Closes #6559.

PiperOrigin-RevId: 254739903

src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
index 871a3a0..6650604 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
@@ -124,8 +124,8 @@
       files.addAll(key.getWorkerFilesWithHashes().keySet());
       files.addAll(worker.getWorkerFilesWithHashes().keySet());
       for (PathFragment file : files) {
-        HashCode oldHash = key.getWorkerFilesWithHashes().get(file);
-        HashCode newHash = worker.getWorkerFilesWithHashes().get(file);
+        HashCode oldHash = worker.getWorkerFilesWithHashes().get(file);
+        HashCode newHash = key.getWorkerFilesWithHashes().get(file);
         if (!oldHash.equals(newHash)) {
           msg.append("\n")
               .append(file.getPathString())