Fixed PMD NullDeref issues in S3Utils.

karuturi · karuturi · commit debcbcc14547 · 2015-03-05T11:58:24.000+05:30
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,22 +339,21 @@ public static List<S3ObjectSummary> getDirectory(final ClientOptions clientOptio
 
     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 ol = client.listObjects(listObjectsRequest);
+        while (ol != null && ol.isTruncated()) {
+            objects.addAll(ol.getObjectSummaries());
+            listObjectsRequest.setMarker(ol.getNextMarker());
+            ol = client.listObjects(listObjectsRequest);
+        }
+
         if (objects.isEmpty()) {
             return emptyList();
         }
 
         return unmodifiableList(objects);
-
     }
 
     public static void putDirectory(final ClientOptions clientOptions, final String bucketName, final File directory, final FilenameFilter fileNameFilter,
