From 3eaaceffac580c8504f2f82a89da59631cd54e93 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 23 Sep 2021 15:37:33 +0200 Subject: [PATCH] cleanup GitOrigin-RevId: 5edec9b77fba14c08c497a03082a0de7bee276cd --- .../src/com/intellij/compiler/server/BuildManager.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 65602603fd54..1530bb347409 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -107,8 +107,7 @@ import org.jetbrains.jps.incremental.storage.ProjectStamps; import org.jetbrains.jps.javac.Iterators; import org.jetbrains.jps.model.java.compiler.JavaCompilers; -import javax.tools.JavaCompiler; -import javax.tools.ToolProvider; +import javax.tools.*; import java.awt.*; import java.io.File; import java.io.IOException; @@ -433,12 +432,8 @@ public final class BuildManager implements Disposable { mySuspendBackgroundTasksCounter.decrementAndGet(); } - @Nullable - private static String getFallbackSdkHome() { + private static @NotNull String getFallbackSdkHome() { String home = SystemProperties.getJavaHome(); // should point either to jre or jdk - if (home == null) { - return null; - } if (!JdkUtil.checkForJdk(home)) { String parent = new File(home).getParent(); if (parent != null && JdkUtil.checkForJdk(parent)) {