Tolerate attempts to resolve multiple times

3 files changed, 11 insertions, 5 deletions

diff --git a/config-lib/abi-spec.json b/config-lib/abi-spec.json
index 6cfce9da0ba..caae2ebf1cf 100644
--- a/config-lib/abi-spec.json
+++ b/config-lib/abi-spec.json
@@ -336,6 +336,7 @@
       "public"
     ],
     "methods" : [
+      "public boolean isResolved()",
       "public java.util.Optional modelId()",
       "public java.util.Optional url()",
       "public java.util.Optional path()",
diff --git a/config-lib/src/main/java/com/yahoo/config/ModelReference.java b/config-lib/src/main/java/com/yahoo/config/ModelReference.java
index 25caad55b84..fbf34c7ff23 100644
--- a/config-lib/src/main/java/com/yahoo/config/ModelReference.java
+++ b/config-lib/src/main/java/com/yahoo/config/ModelReference.java
@@ -32,13 +32,16 @@ public class ModelReference {
         this.resolved = resolved;
     }
 
+    /** Returns whether this is already resolved. */
+    public boolean isResolved() { return resolved != null; }
+
     /** Returns the id specified for this model, oor null if it is resolved. */
     public Optional<String> modelId() { return modelId; }
 
     /** Returns the url specified for this model, or null if it is resolved. */
     public Optional<UrlReference> url() { return url; }
 
-    /** Returns the path specified for this model, oor null if it is resolved. */
+    /** Returns the path specified for this model, or null if it is resolved. */
     public Optional<FileReference> path() { return path; }
 
     /** Returns the path to the file containing this model, or null if this is unresolved. */
@@ -109,7 +112,7 @@ public class ModelReference {
         return new ModelReference(modelId, url, path, null);
     }
 
-    /** Creates a nresolved reference. */
+    /** Creates a resolved reference. */
     public static ModelReference resolved(Path path) {
         return new ModelReference(null, null, null, Objects.requireNonNull(path));
     }
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;
     }