From 6bcb580529e1b152c4a0b1e0b61eb650520ad025 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Thu, 30 Mar 2023 13:14:13 +0200 Subject: [PATCH] Add MVND_NO_MODEL_CACHE support to mvn39 Follow-up to #797, which didn't get backported to the mvn39 part of the code. --- .../apache/maven/project/SnapshotModelCacheFactory.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java b/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java index 08946257..abb49f50 100644 --- a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java +++ b/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java @@ -30,6 +30,8 @@ import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.sisu.Priority; +import static org.mvndaemon.mvnd.common.Environment.MVND_NO_MODEL_CACHE; + @Singleton @Named @Priority(10) @@ -48,6 +50,10 @@ public class SnapshotModelCacheFactory implements ModelCacheFactory { @Override public ModelCache createCache(RepositorySystemSession session) { - return new SnapshotModelCache(globalCache, factory.createCache(session)); + boolean noModelCache = + Boolean.parseBoolean(MVND_NO_MODEL_CACHE.asOptional().orElse(MVND_NO_MODEL_CACHE.getDefault())); + ModelCache reactorCache = factory.createCache(session); + ModelCache globalCache = noModelCache ? reactorCache : this.globalCache; + return new SnapshotModelCache(globalCache, reactorCache); } }