commit 6738c36265c544a116751372ce74209305f44071
author John Cater <jcater@google.com> Fri Oct 20 22:03:00 2017 +0200
committer Dmitry Lomov <dslomov@google.com> Mon Oct 23 17:16:12 2017 +0200
tree 023e0221a1a8cf2df80cb670e7418496b6621509
parent b368b39f8ba1e8e8a67af50e5ade9127b2b149d7

Add tests for ToolchainUtil, and fix an error when there is an error and
values are missing while fetching toolchains.

Fixes #3928.

Change-Id: I4fde784f56daf544ba70c9848e006f1183c20a99
PiperOrigin-RevId: 172922687

src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
index 84c0e25..6676a18 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
@@ -220,14 +220,14 @@
       }
     }
 
-    if (valuesMissing) {
-      return null;
-    }
-
     if (!missingToolchains.isEmpty()) {
       throw new ToolchainContextException(new UnresolvedToolchainsException(missingToolchains));
     }
 
+    if (valuesMissing) {
+      return null;
+    }
+
     return builder.build();
   }