Add a timeout to waitForInitializeJobs() (eclipse-jdtls#1773)

OdomarTrindade · May 18, 2021 · c65e7ea · c65e7ea
1 parent 9b71f1c
commit c65e7ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JobHelpers.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JobHelpers.java
@@ -162,7 +162,11 @@ public static void waitForBuildJobs(int maxTimeMilis) {
 	}
 
 	public static void waitForInitializeJobs() {
-		waitForJobs(InitializeJobMatcher.INSTANCE, MAX_TIME_MILLIS);
+		waitForInitializeJobs(MAX_TIME_MILLIS);
+	}
+
+	public static void waitForInitializeJobs(int maxTimeMillis) {
+		waitForJobs(InitializeJobMatcher.INSTANCE, maxTimeMillis);
 	}
 
 	public static void waitForDownloadSourcesJobs(int maxTimeMillis) {

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java
@@ -243,7 +243,7 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
 	public void initialized(InitializedParams params) {
 		logInfo(">> initialized");
 		try {
-			JobHelpers.waitForInitializeJobs();
+			JobHelpers.waitForInitializeJobs(60 * 60 * 1000); // 1 hour
 		} catch (OperationCanceledException e) {
 			logException(e.getMessage(), e);
 		}