Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted pull 446

This commit is contained in:
Adrian Cole 2012-03-15 08:59:31 -07:00
parent a01ca9adc0
commit b4619a35fd
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
View File

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