From 28617ed96ebebf4c52eae2b3f078cfe555c3da99 Mon Sep 17 00:00:00 2001
From: BoykoAlex <alex.boyko@broadcom.com>
Date: Mon, 2 Jun 2025 09:16:13 -0700
Subject: [PATCH] Fix NPE in computing java version

---
 .../tooling/jdt/ls/commons/classpath/ClasspathUtil.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ClasspathUtil.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ClasspathUtil.java
index 3fec13e2d..a95976fb2 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ClasspathUtil.java
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ClasspathUtil.java
@@ -94,7 +94,8 @@ public class ClasspathUtil {
 				}
 			}
 		}
-		String javaVersion = extractJavaVersion(getJreContainer(javaProject.getRawClasspath()).getPath().lastSegment());
+		IClasspathEntry jreContainer = getJreContainer(javaProject.getRawClasspath());
+		String javaVersion = jreContainer == null ? null : extractJavaVersion(jreContainer.getPath().lastSegment());
 		Classpath classpath = new Classpath(cpEntries, javaVersion);
 		logger.debug("classpath=" + classpath.getEntries().size() + " entries");
 		return classpath;