Updated Branches: refs/heads/1.6.x 1b30e222f -> 53283ebd9
JCLOUDS-192 - found a problem with paging list results for zone-scoped resources on 1.7.0, fixed it here too. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/53283ebd Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/53283ebd Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/53283ebd Branch: refs/heads/1.6.x Commit: 53283ebd967df0f016bd1cb84869396fa8c382ba Parents: 1b30e22 Author: Andrew Bayer <[email protected]> Authored: Tue Jul 30 15:01:52 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Tue Jul 30 15:01:52 2013 -0700 ---------------------------------------------------------------------- .../functions/internal/BaseWithZoneToPagedIterable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/53283ebd/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseWithZoneToPagedIterable.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseWithZoneToPagedIterable.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseWithZoneToPagedIterable.java index 0c17488..1f5317b 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseWithZoneToPagedIterable.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseWithZoneToPagedIterable.java @@ -49,7 +49,7 @@ public abstract class BaseWithZoneToPagedIterable<T, I extends BaseWithZoneToPag Optional<Object> project = tryFind(request.getCaller().get().getArgs(), instanceOf(String.class)); - Optional<Object> zone = tryFind(request.getCaller().get().getArgs(), instanceOf(String.class)); + Optional<Object> zone = tryFind(request.getInvocation().getArgs(), instanceOf(String.class)); Optional<Object> listOptions = tryFind(request.getInvocation().getArgs(), instanceOf(ListOptions.class));
