You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/01/10 07:16:10 UTC
jclouds git commit: Fix testListContainerWithZeroMaxResults on Swift
Repository: jclouds
Updated Branches:
refs/heads/master e8f925225 -> 694558db0
Fix testListContainerWithZeroMaxResults on Swift
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/694558db
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/694558db
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/694558db
Branch: refs/heads/master
Commit: 694558db0cec35878228a51865cf6c6bec07b422
Parents: e8f9252
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Jan 9 22:12:49 2015 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Jan 9 22:12:49 2015 -0800
----------------------------------------------------------------------
.../swift/v1/blobstore/RegionScopedSwiftBlobStore.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/694558db/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
index c0f65c5..9ccc39b 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
@@ -159,7 +159,12 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
containerCache.put(container, Optional.of(objects.getContainer()));
List<? extends StorageMetadata> list = transform(objects, toBlobMetadata(container));
int limit = Optional.fromNullable(options.getMaxResults()).or(10000);
- String marker = list.size() == limit ? list.get(limit - 1).getName() : null;
+ String marker = null;
+ if (list.isEmpty()) {
+ marker = options.getMarker();
+ } else if (list.size() == limit) {
+ marker = list.get(limit - 1).getName();
+ }
// TODO: we should probably deprecate this option
if (options.isDetailed()) {
list = transform(list, new Function<StorageMetadata, StorageMetadata>() {