From 6738c36265c544a116751372ce74209305f44071 Mon Sep 17 00:00:00 2001
From: John Cater <jcater@google.com>
Date: Fri, 20 Oct 2017 22:03:00 +0200
Subject: 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
---
 .../com/google/devtools/build/lib/skyframe/ToolchainUtil.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '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 84c0e256e9..6676a18321 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 @@ public class ToolchainUtil {
       }
     }
 
-    if (valuesMissing) {
-      return null;
-    }
-
     if (!missingToolchains.isEmpty()) {
       throw new ToolchainContextException(new UnresolvedToolchainsException(missingToolchains));
     }
 
+    if (valuesMissing) {
+      return null;
+    }
+
     return builder.build();
   }
 
-- 
cgit v1.2.3