MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

maven: shutdown maven server using application service dispose method instead of shutdown hook

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-12-17 11:20:47 +03:00
parent 7c626d9e48
commit 27a5e1036f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+7 -8
View File
@@ -26,6 +26,7 @@ import com.intellij.execution.rmi.RemoteProcessSupport;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.*;
@@ -33,7 +34,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.*;
import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.ShutDownTracker;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Alarm;
@@ -72,7 +72,8 @@ import java.util.jar.Attributes;
name = "MavenVersion",
storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/mavenVersion.xml")
)
public class MavenServerManager extends RemoteObjectWrapper<MavenServer> implements PersistentStateComponent<MavenServerManager.State> {
public class MavenServerManager extends RemoteObjectWrapper<MavenServer> implements PersistentStateComponent<MavenServerManager.State>,
Disposable {
public static final String BUNDLED_MAVEN_2 = "Bundled (Maven 2)";
public static final String BUNDLED_MAVEN_3 = "Bundled (Maven 3)";
@@ -149,13 +150,11 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
return createRunProfileState();
}
};
}
ShutDownTracker.getInstance().registerShutdownTask(new Runnable() {
@Override
public void run() {
shutdown(false);
}
});
@Override
public void dispose() {
shutdown(false);
}
@SuppressWarnings("ConstantConditions")