summaryrefslogtreecommitdiffstats
path: root/config-application-package/src/main/java/com
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-01-11 13:31:31 +0100
committerMartin Polden <mpolden@mpolden.no>2019-01-11 13:31:31 +0100
commitc60c77398f49d2b3119cde96009a9525601688d5 (patch)
tree1a78d051ed2914d29df1f5a63e3cc59efec81617 /config-application-package/src/main/java/com
parent25221dbd5bff429264aba05dadf7464303abd70a (diff)
Make pre-processing respect region for dev environments
Diffstat (limited to 'config-application-package/src/main/java/com')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java8
1 files changed, 4 insertions, 4 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 9443339624a..0599afa056d 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
@@ -136,11 +136,11 @@ class OverrideProcessor implements PreProcessor {
}
if ( ! elementRegions.isEmpty()) { // match region
- // match region in prod only
- if ( environment.equals(Environment.prod) && ! elementRegions.contains(region)) return false;
+ // match region in multi-region environments only
+ if ( environment.isMultiRegion() && ! elementRegions.contains(region)) return false;
- // explicit region implies prod
- if ( ! environment.equals(Environment.prod) && elementEnvironments.isEmpty() ) return false;
+ // explicit region implies multi-region environment
+ if ( ! environment.isMultiRegion() && elementEnvironments.isEmpty() ) return false;
}
return true;