Tolerate attempts to resolve multiple times

1 files changed, 5 insertions, 3 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
index 6beb11cf8fa..b50c38792c1 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
@@ -249,10 +249,12 @@ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> {
 
     private ModelReference resolveModel(String modelStringValue) {
         var model = ModelReference.valueOf(modelStringValue);
+        if (model.isResolved())
+            return model;
         if (model.url().isPresent() && canResolveUrls()) // url has priority
-            model = ModelReference.resolved(Path.of(resolveUrl(model.url().get().value()).value()));
-        else if (model.path().isPresent())
-            model = ModelReference.resolved(Path.of(resolvePath(model.path().get().value()).value()));
+            return ModelReference.resolved(Path.of(resolveUrl(model.url().get().value()).value()));
+        if (model.path().isPresent())
+            return ModelReference.resolved(Path.of(resolvePath(model.path().get().value()).value()));
         return model;
     }