summaryrefslogtreecommitdiffstats
path: root/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@vespa.ai>2023-05-15 11:56:15 +0200
committerJon Bratseth <bratseth@vespa.ai>2023-05-15 11:56:15 +0200
commit9df18e3066115f6084fab9b5c04ecd303084426c (patch)
tree1c68da2bb7573fcc84a66c327872926478824143 /config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
parent7e39f8036dbeb3722fca3a50fdc9c86129011cf0 (diff)
Don't assume any environments are single-region
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 169b1c8557b..f98f0524fea 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -169,11 +169,7 @@ class OverrideProcessor implements PreProcessor {
}
if ( ! elementRegions.isEmpty()) { // match region
- // match region in multi-region environments only
- if ( environment.isMultiRegion() && ! elementRegions.contains(region)) return false;
-
- // explicit region implies multi-region environment
- if ( ! environment.isMultiRegion() && elementEnvironments.isEmpty() ) return false;
+ if ( ! elementRegions.contains(region)) return false;
}
if ( ! elementTags.isEmpty()) { // match tags