Factor out blob -> hash genrating code so it is common to all file registries.

1 files changed, 11 insertions, 2 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
index 75482ded05d..ac73a0100dc 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/PreGeneratedFileRegistry.java
@@ -80,11 +80,20 @@ public class PreGeneratedFileRegistry implements FileRegistry {
 
     @Override
     public FileReference addUri(String uri) {
-        return new FileReference(path2Hash.get(uri));
+        String reference = path2Hash.get(uri);
+        if (reference == null) {
+            throw new IllegalArgumentException("Uri '" + uri + "' not found");
+        }
+        return new FileReference(reference);
     }
     @Override
     public FileReference addBlob(ByteBuffer blob) {
-        return new FileReference(path2Hash.get(blob));
+        String blobName = FileRegistry.blobName(blob);
+        String reference = path2Hash.get(blobName);
+        if (reference == null) {
+            throw new IllegalArgumentException("Blob '" + blobName + "(" + blob.remaining()+ ")' not found");
+        }
+        return new FileReference(reference);
     }
 
     @Override