From 6c3d7dfd32e0ee9d42b505807ea5405b72f172f2 Mon Sep 17 00:00:00 2001 From: Krzysztof Waclawik Date: Tue, 14 Jul 2026 14:55:32 +0200 Subject: [PATCH] QD-8704 Preventing NPE on race condition when project and application are shut down one after another GitOrigin-RevId: 1f024ffc07b3deed311aea2e5dffa2c04e542588 --- .../org/jetbrains/idea/maven/server/MavenServerConnectorImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnectorImpl.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnectorImpl.kt index 9ec6d9f29b13..0f108df74661 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnectorImpl.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnectorImpl.kt @@ -78,7 +78,7 @@ open class MavenServerConnectorImpl(project: Project, mySupport = factory.create(jdk, vmOptions, mavenDistribution, project, myDebugPort) mySupport!!.onTerminate(Consumer { MavenLog.LOG.debug("[connector] terminate " + this@MavenServerConnectorImpl) - val mavenServerManager = ApplicationManager.getApplication().getServiceIfCreated( + val mavenServerManager = ApplicationManager.getApplication()?.getServiceIfCreated( MavenServerManager::class.java) mavenServerManager?.shutdownConnector(this@MavenServerConnectorImpl, false) })