merged andrei's latest

This commit is contained in:
Adrian Cole 2012-03-20 10:45:55 -07:00
commit 9d2506b7eb
1 changed files with 1 additions and 2 deletions

View File

@ -78,7 +78,6 @@ public class LocationPredicate implements Predicate<ComputeMetadata> {
} }
return or(predicates.build()).apply(input.getLocation()); return or(predicates.build()).apply(input.getLocation());
} }
@Override @Override
@ -86,4 +85,4 @@ public class LocationPredicate implements Predicate<ComputeMetadata> {
// not calling .get() here, as it could accidentally cause eager api fetch // not calling .get() here, as it could accidentally cause eager api fetch
return "equalsParentOrGrandparentOfCurrentLocation()"; return "equalsParentOrGrandparentOfCurrentLocation()";
} }
} }