You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/03/04 11:53:20 UTC
git commit: updated refs/heads/master to c5c1b1d
Repository: cloudstack
Updated Branches:
refs/heads/master 0b6c540a2 -> c5c1b1d46
Fixed checkstyle issues due to commit 0b6c540a203453580bb76a0d0a60be292fccfa0e
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5c1b1d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5c1b1d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5c1b1d4
Branch: refs/heads/master
Commit: c5c1b1d4628c5fc7a402586325c7bf937f42766e
Parents: 0b6c540
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Mar 4 16:21:53 2015 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Wed Mar 4 16:21:53 2015 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/S3Utils.java | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5c1b1d4/utils/src/com/cloud/utils/S3Utils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
index 37aeb91..6784587 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,18 +339,16 @@ public final class S3Utils {
private static List<S3ObjectSummary> listDirectory(final String bucketName, final String directory, final AmazonS3 client) {
- List<S3ObjectSummary> objects = new ArrayList<S3ObjectSummary>();
- ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR);
- ObjectListing objectListing;
-
- do {
- objectListing = client.listObjects(listObjectsRequest);
-
- if (objectListing != null )
- objects.addAll(objectListing.getObjectSummaries());
- listObjectsRequest.setMarker(objectListing.getNextMarker());
- } while (objectListing.isTruncated());
-
+ List<S3ObjectSummary> objects = new ArrayList<S3ObjectSummary>();
+ ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR);
+ ObjectListing objectListing;
+
+ do {
+ objectListing = client.listObjects(listObjectsRequest);
+ if (objectListing != null )
+ objects.addAll(objectListing.getObjectSummaries());
+ listObjectsRequest.setMarker(objectListing.getNextMarker());
+ } while (objectListing.isTruncated());
if (objects.isEmpty()) {
return emptyList();
}