From 3d9c285e70fdf1b94913eda852afb1a8872f0ab0 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 17 Dec 2015 11:31:51 +0300 Subject: [PATCH] maven: cleanup --- .../idea/maven/server/MavenServerManager.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java index a3c72d99d582..794ef11d51ba 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java @@ -36,7 +36,6 @@ import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Alarm; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.Converter; @@ -90,9 +89,6 @@ public class MavenServerManager extends RemoteObjectWrapper impleme private final RemoteMavenServerDownloadListener myDownloadListener = new RemoteMavenServerDownloadListener(); private boolean myLoggerExported; private boolean myDownloadListenerExported; - - private final Alarm myShutdownAlarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD); - private State myState = new State(); private static class BundledMavenPathHolder { private static final File myBundledMaven2Home; @@ -207,8 +203,6 @@ public class MavenServerManager extends RemoteObjectWrapper impleme } myDownloadListenerExported = false; } - - myShutdownAlarm.cancelAllRequests(); } @NotNull @@ -216,10 +210,7 @@ public class MavenServerManager extends RemoteObjectWrapper impleme if (myState.embedderJdk.equals(MavenRunnerSettings.USE_JAVA_HOME)) { final String javaHome = System.getenv("JAVA_HOME"); if (!StringUtil.isEmptyOrSpaces(javaHome)) { - Sdk jdk = JavaSdk.getInstance().createJdk("", javaHome); - if (jdk != null) { - return jdk; - } + return JavaSdk.getInstance().createJdk("", javaHome); } }