FISH-13206 Fix TypeError: portStr.trim is not a function when debug port is a number

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,7 +744,7 @@ export class PayaraServerInstanceController extends PayaraInstanceController {
         });
     }
 
-    private async stopAndStartInDebugMode(payaraServer: PayaraLocalServerInstance, debugPort: string, callback?: (status: boolean) => any): Promise<void> {
+    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);
@@ -879,7 +879,7 @@ export class PayaraServerInstanceController extends PayaraInstanceController {
             this.selectListedServer(callback);
         }
     }
- 
+
     public readDebugPortFromWorkspace(uri: Uri) {
         const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri);
         if (workspaceFolder) {
@@ -1156,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 {