Fixes #612 - ensure deleted servers are stopped

Signed-off-by: Rob Stryker <[email protected]>
redhat-developer · Nov 19, 2020 · d9ae9dc · d9ae9dc
1 parent 6494d3f
commit d9ae9dc
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/ServerManagementServerImpl.java b/...tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/ServerManagementServerImpl.java
@@ -21,6 +21,7 @@
 
 import org.jboss.tools.rsp.api.RSPClient;
 import org.jboss.tools.rsp.api.RSPServer;
+import org.jboss.tools.rsp.api.ServerManagementAPIConstants;
 import org.jboss.tools.rsp.api.SocketLauncher;
 import org.jboss.tools.rsp.api.dao.Attributes;
 import org.jboss.tools.rsp.api.dao.ClientCapabilitiesRequest;
@@ -265,6 +266,14 @@ private Status deleteServerSync(ServerHandle handle) {
 
 		IServer server = managementModel.getServerModel().getServer(handle.getId());
 		boolean b = managementModel.getServerModel().removeServer(server);
+		if( server.getDelegate().getServerRunState() != ServerManagementAPIConstants.STATE_STOPPED) {
+			new Thread("Stopping server: " + server.getName()) {
+				public void run() {
+					IServerDelegate del = server.getDelegate();
+					del.stop(false);
+				}
+			}.start();
+		}
 		return booleanToStatus(b, "Server not removed: " + handle.getId());
 	}