fix issue #29770: always store raw model into cache

(cherry picked from commit 86e6600)
quarkusio · Dec 20, 2022 · 7b71598 · 7b71598
1 parent a36fb21
commit 7b71598
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java b/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java
@@ -153,13 +153,11 @@ private LocalProject loadAndCacheProject(Path pomFile) throws BootstrapMavenExce
     }
 
     private Model rawModel(Path pomFile) throws BootstrapMavenException {
-        final Model rawModel = rawModelCache.getOrDefault(pomFile.getParent(),
+        Model rawModel = rawModelCache.getOrDefault(pomFile.getParent(),
                 modelProvider == null ? null : modelProvider.apply(pomFile.getParent()));
-        return rawModel == null ? loadAndCacheRawModel(pomFile) : rawModel;
-    }
-
-    private Model loadAndCacheRawModel(Path pomFile) throws BootstrapMavenException {
-        final Model rawModel = readModel(pomFile);
+        if (rawModel == null) {
+            rawModel = readModel(pomFile);
+        }
         rawModelCache.put(pomFile.getParent(), rawModel);
         return rawModel;
     }