From 2f47c4510fc9bfc8e2220e497ca6f26d4631711f Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 16 Apr 2025 16:08:00 +0100
Subject: [PATCH] [MTOOLCHAINS-53] Fix possible NPE

---
 .../maven/plugins/toolchain/jdk/ToolchainDiscoverer.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java b/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java
index 897e69e..19199a5 100644
--- a/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java
+++ b/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java
@@ -238,8 +238,10 @@ ToolchainModel getToolchainModel(Path jdk) {
         ToolchainModel model = cache.get(jdk);
         if (model == null) {
             model = doGetToolchainModel(jdk);
-            cache.put(jdk, model);
-            cacheModified = true;
+            if (model != null) {
+                cache.put(jdk, model);
+                cacheModified = true;
+            }
         }
         return model;
     }