Merge pull request #18729 from vespa-engine/balder/improve-distributable-resource-validation

Improve sanity check for blobs.

1 files changed, 10 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
index ffa9cbe9ba5..4793caad308 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java
@@ -76,8 +76,16 @@ public class DistributableResource {
     public String getFileReference() { return fileReference; }
 
     public void validate() {
-        if (path == null || path.isEmpty())
-            throw new IllegalArgumentException("Distributable resource must have a file or uri.");
+        switch (pathType) {
+            case FILE:
+            case URI:
+                if (path == null || path.isEmpty())
+                    throw new IllegalArgumentException("Distributable URI/FILE resource must have a file or uri.");
+                break;
+            case BLOB:
+                if (blob == null)
+                    throw new IllegalArgumentException("Distributable BLOB can not be null.");
+        }
     }
 
     public String toString() {