commit f091f9cdcc8e069d37fd97d7e4bbd7e2e36219ac
author janakr <janakr@google.com> Mon Mar 25 13:42:18 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 25 13:44:50 2019 -0700
tree 9ba251d88874a6e79dfac103b20e51979bd3d6a9
parent 81c4bbf5fa799a3ec6291e78330f5539296b83dd

Make deterministic the error that is stored in TransitiveTraversalValue. When there are multiple errors, we don't want non-determinism.

PiperOrigin-RevId: 240208756

src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index 3d56f5b..5184e8e 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -892,9 +892,9 @@
     for (Map.Entry<SkyKey, SkyValue> successfulEntry : successfulEntries) {
       successfulKeysBuilder.add(successfulEntry.getKey());
       TransitiveTraversalValue value = (TransitiveTraversalValue) successfulEntry.getValue();
-      String firstErrorMessage = value.getFirstErrorMessage();
-      if (firstErrorMessage != null) {
-        errorMessagesBuilder.add(firstErrorMessage);
+      String errorMessage = value.getErrorMessage();
+      if (errorMessage != null) {
+        errorMessagesBuilder.add(errorMessage);
       }
     }
     ImmutableSet<SkyKey> successfulKeys = successfulKeysBuilder.build();