Don't allow null

1 files changed, 2 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index f03c80b4f78..fc3f1974c9f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -135,12 +135,12 @@ public class DeployState implements ConfigDefinitionStore {
         if ( ! existingConfigDefs.containsKey(defKey)) return Optional.empty();
 
         if (defArchive.get(defKey) != null)
-            return Optional.ofNullable(defArchive.get(defKey));
+            return Optional.of(defArchive.get(defKey));
 
         ConfigDefinition def = existingConfigDefs.get(defKey).parse();
 
         defArchive.put(defKey, def);
-        return Optional.ofNullable(def);
+        return Optional.of(def);
     }
 
     private static Map<ConfigDefinitionKey, UnparsedConfigDefinition> createLazyMapping(final ConfigDefinitionRepo configDefinitionRepo) {