Merge pull request #30665 from vespa-engine/revert-30663-balder/check-for-presence-first

Revert "Check that schema exists first."

1 files changed, 2 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 378907eafd7..01708333ed5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -314,14 +314,12 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer>
 
     private boolean hasIndexingModeStreaming(NewDocumentType type) {
         if (indexedCluster == null) return false;
-        var schemaInfo = indexedCluster.schemas().get(type.getName());
-        return (schemaInfo != null) && (schemaInfo.getIndexMode() == SchemaInfo.IndexMode.STREAMING);
+        return indexedCluster.schemas().get(type.getName()).getIndexMode() == SchemaInfo.IndexMode.STREAMING;
     }
 
     private boolean hasIndexingModeIndexed(NewDocumentType type) {
         if (indexedCluster == null) return false;
-        var schemaInfo = indexedCluster.schemas().get(type.getName());
-        return (schemaInfo != null) && (schemaInfo.getIndexMode() == SchemaInfo.IndexMode.INDEX);
+        return indexedCluster.schemas().get(type.getName()).getIndexMode() == SchemaInfo.IndexMode.INDEX;
     }
 
     private boolean hasIndexingModeStoreOnly(NewDocumentType type) {