From debcbcc1454789936407583fe0aba8e158b16cad Mon Sep 17 00:00:00 2001
From: Rajani Karuturi <rajanikaruturi@gmail.com>
Date: Thu, 5 Mar 2015 11:58:24 +0530
Subject: [PATCH] Fixed PMD NullDeref issues in S3Utils.

---
 utils/src/com/cloud/utils/S3Utils.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
index 67845871106..ae7a453d48c 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,22 +339,21 @@ 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 ol = client.listObjects(listObjectsRequest);
+        while (ol != null && ol.isTruncated()) {
+            objects.addAll(ol.getObjectSummaries());
+            listObjectsRequest.setMarker(ol.getNextMarker());
+            ol = client.listObjects(listObjectsRequest);
+        }
 
-     do {
-      objectListing = client.listObjects(listObjectsRequest);
-      if (objectListing != null )
-        objects.addAll(objectListing.getObjectSummaries());
-      listObjectsRequest.setMarker(objectListing.getNextMarker());
-     } while (objectListing.isTruncated());
         if (objects.isEmpty()) {
             return emptyList();
         }
 
         return unmodifiableList(objects);
-
     }
 
     public static void putDirectory(final ClientOptions clientOptions, final String bucketName, final File directory, final FilenameFilter fileNameFilter,