From 0676300841773f9ca763be52714061268ce0f3f8 Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Thu, 15 Mar 2012 03:01:16 +0000
Subject: [PATCH] fixes in location containment predicate. the grouping of
 and's and or's was wrong, causing an NPE in cloudstack tests when
 investigating parents; the direction of containment (input should be
 descendent of location) was wrong also, i think, to judge by the description
 "locationEqualsOrChildOf"; code is now a loop rather than fixed investigation
 of 3 levels

---
 .../domain/internal/TemplateBuilderImpl.java    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index 17f1da2d43..ae483158dd 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -139,17 +139,20 @@ public class TemplateBuilderImpl implements TemplateBuilder {
     * 
     * If the input location is null, then the data isn't location sensitive
     * 
-    * If the input location is a parent of the specified location, then we are ok.
+    * If the input location is a child (descendent, recursively) of the specified location, then we are ok.
     */
    final Predicate<ComputeMetadata> locationPredicate = new Predicate<ComputeMetadata>() {
       @Override
       public boolean apply(ComputeMetadata input) {
-         boolean returnVal = true;
-         if (location != null && input.getLocation() != null)
-            returnVal = location.equals(input.getLocation()) || location.getParent() != null
-                  && location.getParent().equals(input.getLocation()) || location.getParent().getParent() != null
-                  && location.getParent().getParent().equals(input.getLocation());
-         return returnVal;
+         if (location == null) return true;
+         Location inputLocation = input.getLocation();
+         if (inputLocation == null) return true;
+         while (inputLocation!=null) {
+            if (location.equals(inputLocation))
+               return true;
+            inputLocation = inputLocation.getParent();
+         }
+         return false;
       }
 
       @Override