Fix: args passing & increase attempts interval

microsoft · Jul 31, 2024 · d45c79f · d45c79f
1 parent 59195dc
commit d45c79f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/...com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/ImporterPlugin.java b/...com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/ImporterPlugin.java
@@ -43,10 +43,6 @@ public void start(BundleContext context) throws Exception {
         ImporterPlugin.instance = this;
         bundleVersion = context.getBundle().getVersion().toString();
         digestStore = new DigestStore(getStateLocation().toFile());
-        Optional<File> bundleFile = FileLocator.getBundleFileLocation(context.getBundle());
-        if (!bundleFile.isPresent()) {
-           throw new IllegalStateException("Failed to get bundle location.");
-        }
     }
 
     @Override

diff --git a/...om.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/NamedPipeStream.java b/...om.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/NamedPipeStream.java
@@ -147,7 +147,7 @@ private void attemptConnection(File pipeFile) throws IOException {
 
         private void sleep(IOException e, int attempts) {
             try {
-                Thread.sleep(1000);
+                Thread.sleep(2000);
             } catch (InterruptedException ie) {
                 Thread.currentThread().interrupt();
                 throw new RuntimeException("Thread interrupted while handling connection failure", ie);

diff --git a/extension/src/server/GradleServer.ts b/extension/src/server/GradleServer.ts
@@ -5,7 +5,7 @@ import * as getPort from "get-port";
 import * as kill from "tree-kill";
 import { commands } from "vscode";
 import { sendInfo } from "vscode-extension-telemetry-wrapper";
-import { getGradleServerCommand, getGradleServerEnv } from "./serverUtil";
+import { getGradleServerCommand, getGradleServerEnv, quoteArg } from "./serverUtil";
 import { Logger } from "../logger/index";
 import { NO_JAVA_EXECUTABLE, OPT_RESTART } from "../constant";
 import { redHatJavaInstalled } from "../util/config";
@@ -63,13 +63,14 @@ export class GradleServer {
         }
         const startBuildServer = redHatJavaInstalled() ? "true" : "false";
         const args = [
-            `--port=${this.taskServerPort}`,
-            `--startBuildServer=${startBuildServer}`,
-            `--languageServerPipePath=${this.languageServerPipePath}`,
+            quoteArg(`--port=${this.taskServerPort}`),
+            quoteArg(`--startBuildServer=${startBuildServer}`),
+            quoteArg(`--languageServerPipePath=${this.languageServerPipePath}`),
         ];
         if (startBuildServer === "true") {
             const buildServerPipeName = this.bspProxy.getBuildServerPipeName();
-            args.push(`--pipeName=${buildServerPipeName}`, `--bundleDir=${bundleDirectory}`);
+            args.push(quoteArg(`--pipeName=${buildServerPipeName}`));
+            args.push(quoteArg(`--bundleDir=${bundleDirectory}`));
         }
         this.logger.debug(`Gradle Server cmd: ${cmd} ${args.join(" ")}`);
 

diff --git a/extension/src/server/serverUtil.ts b/extension/src/server/serverUtil.ts
@@ -21,6 +21,10 @@ export interface ProcessEnv {
     [key: string]: string | undefined;
 }
 
+export function quoteArg(arg: string): string {
+    return `"${arg}"`;
+}
+
 export async function getGradleServerEnv(): Promise<ProcessEnv | undefined> {
     const javaHome = getConfigJavaImportGradleJavaHome() || getRedHatJavaEmbeddedJRE() || (await findValidJavaHome());
     const env = { ...process.env };