Временная замена получения конфигурации с fork.join на get

1c-syntax · Jan 2, 2022 · 07da734 · 07da734
1 parent 15e37f5
commit 07da734
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -190,12 +190,16 @@ private Configuration computeConfigurationMetadata() {
     }
 
     Configuration configuration;
-    ForkJoinPool customThreadPool = new ForkJoinPool();
+    var customThreadPool = new ForkJoinPool();
     try {
-      configuration = customThreadPool.submit(() -> Configuration.create(configurationRoot)).fork().join();
-    } catch (RuntimeException e) {
+      configuration = customThreadPool.submit(() -> Configuration.create(configurationRoot)).get();
+    } catch (ExecutionException e) {
       LOGGER.error("Can't parse configuration metadata. Execution exception.", e);
       configuration = Configuration.create();
+    } catch (InterruptedException e) {
+      LOGGER.error("Can't parse configuration metadata. Interrupted exception.", e);
+      configuration = Configuration.create();
+      Thread.currentThread().interrupt();
     }
 
     return configuration;