You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/04 12:30:12 UTC
[5/5] git commit: updated refs/heads/4.5 to 1f97f94
Fixed checkstyle issues due to commit 0b6c540a203453580bb76a0d0a60be292fccfa0e
(cherry picked from commit c5c1b1d4628c5fc7a402586325c7bf937f42766e)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f97f940
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f97f940
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f97f940
Branch: refs/heads/4.5
Commit: 1f97f940467f9c603bfef99c1162d8e2ec0e1a5f
Parents: 0ae5912
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Wed Mar 4 16:21:53 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 4 16:59:13 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/1f97f940/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();
}