Merge pull request #255 from jGauravGupta/deploy-with-debug

FISH-13206 Fix "Debug on Server" deployment failure caused by JVM module access error on restart

Author: jGauravGupta

src/main/fish/payara/server/PayaraServerInstanceController.ts

@@ -634,7 +634,7 @@ export class PayaraServerInstanceController extends PayaraInstanceController {
     }
 
 
-    public async startServer(payaraServer: PayaraLocalServerInstance, debug: boolean, debugPort: string, callback?: (status: boolean) => any): Promise<void> {
+    public async startServer(payaraServer: PayaraLocalServerInstance, debug: boolean, debugPort: string | number | undefined, callback?: (status: boolean) => any): Promise<void> {
         if (!payaraServer.isStopped()) {
             vscode.window.showErrorMessage('Payara Server instance already running.');
             return;
@@ -744,6 +744,25 @@ export class PayaraServerInstanceController extends PayaraInstanceController {
         });
     }
 
+    private async stopAndStartInDebugMode(payaraServer: PayaraLocalServerInstance, debugPort: string | number | undefined, callback?: (status: boolean) => any): Promise<void> {
+        let endpoints: RestEndpoints = new RestEndpoints(payaraServer);
+        endpoints.invoke("stop-domain", async (_res) => {
+            payaraServer.setState(InstanceState.STOPPED);
+            payaraServer.setDebug(false);
+            await new Promise(resolve => setTimeout(resolve, 2000));
+            this.refreshServerList();
+            payaraServer.disconnectOutput();
+            this.startServer(payaraServer, true, debugPort, callback);
+        },
+            (_res, message) => {
+                vscode.window.showErrorMessage('Unable to stop the Payara Server before restarting in debug mode. ' + message);
+                if (callback) {
+                    callback(false);
+                }
+            }
+        );
+    }
+
     public async renameServer(payaraServer: PayaraServerInstance): Promise<void> {
         if (payaraServer) {
             await vscode.window.showInputBox({
@@ -848,7 +867,7 @@ export class PayaraServerInstanceController extends PayaraInstanceController {
                 if (server instanceof PayaraLocalServerInstance && !server.isStarted()) {
                     this.startServer(server, debug, debugPort, deploy);
                 } else if (server instanceof PayaraLocalServerInstance && debug && !server.isDebug()) {
-                    this.restartServer(server, debug, deploy);
+                    this.stopAndStartInDebugMode(server, debugPort, deploy);
                 } else {
                     deploy(true);
                 }
@@ -1137,4 +1156,4 @@ interface State {
     username: string;
     password: string;
     name: string;
-}
+}

src/main/fish/payara/server/start/StartTask.ts

@@ -34,7 +34,7 @@ import { PayaraLocalServerInstance } from "../PayaraLocalServerInstance";
 
 export class StartTask {
 
-    public startServer(payaraServer: PayaraLocalServerInstance, debug: boolean, debugPort: string): ChildProcess {
+    public startServer(payaraServer: PayaraLocalServerInstance, debug: boolean, debugPort: string | number | undefined): ChildProcess {
         let jvmConfigReader: JvmConfigReader = new JvmConfigReader(payaraServer.getDomainXmlPath(), ServerUtils.DAS_NAME);
 
         let javaHome: string | undefined = payaraServer.getJDKHome();
@@ -49,12 +49,12 @@ export class StartTask {
 
         for (const jvmOption of jvmConfigReader.getJvmOptions()) {
             if (JDKVersion.isCorrectJDK(
-                javaVersion,
-                jvmOption.vendor,
-                jvmOption.minVersion,
-                jvmOption.maxVersion,
-                jvmOption.option,
-                javaHome)) {
+                    javaVersion,
+                    jvmOption.vendor,
+                    jvmOption.minVersion,
+                    jvmOption.maxVersion,
+                    jvmOption.option,
+                    javaHome)) {
 
                 optList.push(jvmOption.option);
             }
@@ -105,12 +105,16 @@ export class StartTask {
         return cp.spawn(javaVmExe, args, { cwd: payaraServer.getPath() });
     }
 
-    private isValidPort(portStr?: string): boolean {
-        if (!portStr) {
+    private isValidPort(portStr?: string | number): boolean {
+        if (portStr === undefined || portStr === null || portStr === '') {
             return false;
         }
-        const port = parseInt(portStr, 10);
-        return portStr.trim() !== '' && port >= 0 && port <= 65535;
+        const portString = String(portStr).trim();
+        if (portString === '') {
+            return false;
+        }
+        const port = parseInt(portString, 10);
+        return !isNaN(port) && port >= 0 && port <= 65535;
     }
 
     private addJavaAgent(payaraServer: PayaraLocalServerInstance, jvmConfigReader: JvmConfigReader): void {