Fix NPE in AvailableToolChains fixture

valdisrigdon · Jun 14, 2016 · 4617c92 · 4617c92
1 parent 1aa0def
commit 4617c92
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...ative/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/AvailableToolChains.java b/...ative/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/AvailableToolChains.java
@@ -47,7 +47,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.gradle.nativeplatform.fixtures.VisualStudioVersion.*;
+import static org.gradle.nativeplatform.fixtures.VisualStudioVersion.VISUALSTUDIO_2012;
+import static org.gradle.nativeplatform.fixtures.VisualStudioVersion.VISUALSTUDIO_2013;
 
 public class AvailableToolChains {
     private static List<ToolChainCandidate> toolChains;
@@ -129,9 +130,11 @@ static private List<ToolChainCandidate> findVisualCpps() {
         List<ToolChainCandidate> toolChains = Lists.newArrayList();
 
         for (VisualStudioLocator.SearchResult searchResult : searchResults) {
-            VisualStudioInstall install = searchResult.getVisualStudio();
-            if (isTestableVisualStudioVersion(install.getVersion()) && searchResult.isAvailable()) {
-                toolChains.add(new InstalledVisualCpp(getVisualStudioVersion(install.getVersion())).withInstall(install));
+            if (searchResult.isAvailable()) {
+                VisualStudioInstall install = searchResult.getVisualStudio();
+                if (isTestableVisualStudioVersion(install.getVersion())) {
+                    toolChains.add(new InstalledVisualCpp(getVisualStudioVersion(install.getVersion())).withInstall(install));
+                }
             }
         }