CLOUDSTACK-8703: Fixed issue when listing directory on S3, it would only return objectSummaries when the anwser from the S3 System was truncated.

Boris Schrijver · Boris Schrijver · commit 5f87e9c917fa · 2015-08-03T17:10:05.000+02:00
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
@@ -352,10 +352,15 @@ private static List<S3ObjectSummary> listDirectory(final String bucketName, fina
         ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR);
 
         ObjectListing ol = client.listObjects(listObjectsRequest);
-        while (ol != null && ol.isTruncated()) {
+        if(ol.isTruncated()) {
+            do {
+                objects.addAll(ol.getObjectSummaries());
+                listObjectsRequest.setMarker(ol.getNextMarker());
+                ol = client.listObjects(listObjectsRequest);
+            } while (ol.isTruncated());
+        }
+        else {
             objects.addAll(ol.getObjectSummaries());
-            listObjectsRequest.setMarker(ol.getNextMarker());
-            ol = client.listObjects(listObjectsRequest);
         }
 
         if (objects.isEmpty()) {
