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

Merge pull request #446 from ahgittin/1.4.x-fix-location-npe-and-containment-direction-semantics 

Fix location npe and containment direction semantics
This commit is contained in:
Andrei Savu 2012-03-15 00:23:33 -07:00
parent fc58a77381 f030c2f3a2
commit 76f8e9e354
1 changed files with 10 additions and 7 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,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