diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-10-28 08:45:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-28 08:45:37 +0200 |
commit | f9076902965b87a25827a41925edda9b9e728f77 (patch) | |
tree | ef922dfc817c1120a7186cdc7202350fa3804504 /configserver | |
parent | d1cff84a0ebb690055faac2af20574a8f5bd7c9e (diff) | |
parent | ac826159d42b662e9504496b135e2f2a1304c8bd (diff) |
Merge pull request #28903 from vespa-engine/jonmv/reconfigurable-dispatcher-cleanup
Always use reconfigurable dispatcher
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 7e54c5164f7..5ad8eee90e8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -205,7 +205,6 @@ public class ModelContextImpl implements ModelContext { private final boolean enableGlobalPhase; private final String summaryDecodePolicy; private final boolean enableNestedMultivalueGrouping; - private final boolean useReconfigurableDispatcher; private final int contentLayerMetadataFeatureLevel; private final boolean dynamicHeapSize; private final String unknownConfigDefinition; @@ -250,7 +249,6 @@ public class ModelContextImpl implements ModelContext { this.enableGlobalPhase = flagValue(source, appId, version, Flags.ENABLE_GLOBAL_PHASE); this.summaryDecodePolicy = flagValue(source, appId, version, Flags.SUMMARY_DECODE_POLICY); this.enableNestedMultivalueGrouping = flagValue(source, appId, version, Flags.ENABLE_NESTED_MULTIVALUE_GROUPING); - this.useReconfigurableDispatcher = flagValue(source, appId, version, Flags.USE_RECONFIGURABLE_DISPATCHER); this.contentLayerMetadataFeatureLevel = flagValue(source, appId, version, Flags.CONTENT_LAYER_METADATA_FEATURE_LEVEL); this.dynamicHeapSize = flagValue(source, appId, version, Flags.DYNAMIC_HEAP_SIZE); this.unknownConfigDefinition = flagValue(source, appId, version, Flags.UNKNOWN_CONFIG_DEFINITION); @@ -296,14 +294,13 @@ public class ModelContextImpl implements ModelContext { @Override public int rpcEventsBeforeWakeup() { return rpc_events_before_wakeup; } @Override public String logFileCompressionAlgorithm(String defVal) { var fflag = this.logFileCompressionAlgorithm; - if (fflag != null && ! fflag.equals("")) { + if (fflag != null && ! fflag.isEmpty()) { return fflag; } return defVal; } @Override public boolean enableGlobalPhase() { return enableGlobalPhase; } @Override public boolean enableNestedMultivalueGrouping() { return enableNestedMultivalueGrouping; } - @Override public boolean useReconfigurableDispatcher() { return useReconfigurableDispatcher; } @Override public int contentLayerMetadataFeatureLevel() { return contentLayerMetadataFeatureLevel; } @Override public boolean dynamicHeapSize() { return dynamicHeapSize; } @Override public String unknownConfigDefinition() { return unknownConfigDefinition; } |