diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java index 37aeb9138d0..67845871106 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 listDirectory(final String bucketName, final String directory, final AmazonS3 client) { - List objects = new ArrayList(); - ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR); - ObjectListing objectListing; + List objects = new ArrayList(); + 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(); }