From 7b715986a005cfcb6ab569b277edd8957019e638 Mon Sep 17 00:00:00 2001 From: benstone Date: Sun, 11 Dec 2022 13:19:07 +0800 Subject: [PATCH] fix issue #29770: always store raw model into cache (cherry picked from commit 86e6600260e77a34236c2b1fc302a3d637f61ecb) --- .../resolver/maven/workspace/WorkspaceLoader.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java index a30aad09d2f53..9e2587ee65a3b 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java +++ b/independent-projects/bootstrap/maven-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; }