From 78e137fd67c6502713dba4e707cf1287fe9ed121 Mon Sep 17 00:00:00 2001
From: Louis Vignier <louis.vignier@jetbrains.com>
Date: Thu, 19 Feb 2026 11:20:25 +0100
Subject: [PATCH] IJPL-224736 jdk: fix NPE in JdkDownloadService

#IJPL-224736 Fixed


(cherry picked from commit 347cfdd61f3487d9fb051e56d05666ccc7a8fcfc)

IJ-CR-192462

GitOrigin-RevId: 0d3c70a7c4393a8893d3a7f850e52c80a90713e9
---
 .../ide/projectWizard/generators/JdkDownloadService.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/JdkDownloadService.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/JdkDownloadService.kt
index fb227526880a..b2142a0c6a02 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/JdkDownloadService.kt
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/JdkDownloadService.kt
@@ -35,9 +35,9 @@ class JdkDownloadService(private val project: Project, private val coroutineScop
     }
   }
 
-  fun scheduleDownloadSdk(sdk: Sdk): CompletableFuture<Boolean> {
+  fun scheduleDownloadSdk(sdk: Sdk?): CompletableFuture<Boolean> {
     return coroutineScope.async {
-      if (!SdkDownloadTracker.getInstance().isDownloading(sdk)) return@async false
+      if (sdk == null || !SdkDownloadTracker.getInstance().isDownloading(sdk)) return@async false
       withBackgroundProgress(project, JavaUiBundle.message("progress.title.downloading", sdk.name)) {
         JdkDownloadUtil.downloadSdk(sdk)
       }