Make nicer

1 files changed, 7 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 c1a3b75c3a1..db506c0ed51 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
@@ -118,15 +118,18 @@ class OverrideProcessor implements PreProcessor {
         Iterator<Element> elemIt = children.iterator();
         while (elemIt.hasNext()) {
             Element child = elemIt.next();
-            Optional<Environment> env = getEnvironment(child);
-            RegionName reg = getRegion(child);
-            if ((env.isPresent() && !environment.equals(env.get())) || 
-                (!reg.isDefault() && (!region.equals(reg) || !environment.equals(Environment.prod)))) {
+            if ( ! matches(getEnvironment(child), getRegion(child))) {
                 parent.removeChild(child);
                 elemIt.remove();
             }
         }
     }
+    
+    private boolean matches(Optional<Environment> elementEnvironment, RegionName elementRegion) {
+        if (elementEnvironment.isPresent() && ! environment.equals(elementEnvironment.get())) return false;
+        if ( ! elementRegion.isDefault() &&  ( ! region.equals(elementRegion) || ! environment.equals(Environment.prod))) return false;
+        return true;
+    }
 
     /**
      * Find the most specific element and remove all others.