From a69e3adfaa8ee3a780e6345f418f8e39b15d18c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Wed, 21 Nov 2018 16:47:05 +0100
Subject: [PATCH] [platform] Preloader: skip registration in headless mode

---
 .../src/com/intellij/openapi/application/Preloader.java         | 2 +-
 platform/platform-resources/src/componentSets/Platform.xml      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/Preloader.java b/platform/platform-impl/src/com/intellij/openapi/application/Preloader.java
index c1bf24a7adb2..91fa665fb3c0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/Preloader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/Preloader.java
@@ -44,7 +44,7 @@ public class Preloader implements Disposable, BaseComponent {
 
   @Override
   public void initComponent() {
-    if (ApplicationManager.getApplication().isUnitTestMode() || ApplicationManager.getApplication().isHeadlessEnvironment()) {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
       return;
     }
 
diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index 9c000936f4fb..57716654133a 100644
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -75,6 +75,7 @@
     </component>
     <component>
       <implementation-class>com.intellij.openapi.application.Preloader</implementation-class>
+      <headless-implementation-class/>
     </component>
 
     <component>