etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed checkstyle issues due to commit 0b6c540a20 

(cherry picked from commit c5c1b1d462)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rajani Karuturi 2015-03-04 16:21:53 +05:30 committed by Rohit Yadav
parent 0ae5912f00
commit 1f97f94046
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/src/com/cloud/utils/S3Utils.java
View File

@ -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;
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());
do {
objectListing = client.listObjects(listObjectsRequest);
if (objectListing != null )
objects.addAll(objectListing.getObjectSummaries());
listObjectsRequest.setMarker(objectListing.getNextMarker());
} while (objectListing.isTruncated());
if (objects.isEmpty()) {
return emptyList();
}