From 38afedf100c29a9b0ae51b5b2e8ef04ba893ee52 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 1 Nov 2024 20:54:31 +0400
Subject: [PATCH] make ourApplication volatile

`setApplication` can be called from different threads.


(cherry picked from commit 9661ac9f49f6e98c85e5fd6e46772c2e48755825)

IJ-CR-151319

GitOrigin-RevId: ac55d5b6845b07910060451e1f29769330c77a96
---
 .../com/intellij/openapi/application/ApplicationManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/openapi/application/ApplicationManager.java b/platform/core-api/src/com/intellij/openapi/application/ApplicationManager.java
index 5c0fe6d65f20..370d06dfe1ab 100644
--- a/platform/core-api/src/com/intellij/openapi/application/ApplicationManager.java
+++ b/platform/core-api/src/com/intellij/openapi/application/ApplicationManager.java
@@ -17,7 +17,7 @@ import java.util.function.Supplier;
  */
 public class ApplicationManager {
   @ApiStatus.Internal
-  protected static Application ourApplication;
+  protected volatile static Application ourApplication;
 
   public static Application getApplication() {
     return ourApplication;