Merged branch idea251.release into idea251.x

Author: builduser

scala/compiler-integration/src/org/jetbrains/plugins/scala/compiler/CompileServerLauncher.scala

@@ -77,10 +77,12 @@ object CompileServerLauncher {
     }
   }
 
-  ScalaShutDownTracker.registerShutdownTask(() => {
-    LOG.info("Shutdown event triggered, stopping server")
-    stopServerAndWaitFor(Duration.Zero)
-  })
+  executeOnPooledThread {
+    ScalaShutDownTracker.registerShutdownTask(() => {
+      LOG.info("Shutdown event triggered, stopping server")
+      stopServerAndWaitFor(Duration.Zero)
+    })
+  }
 
   private def isUnitTestMode: Boolean =
     ApplicationManager.getApplication.isUnitTestMode