You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/05 08:19:43 UTC
git commit: updated refs/heads/4.5 to 04efdce
Repository: cloudstack
Updated Branches:
refs/heads/4.5 76674c40d -> 04efdce90
Fixed PMD NullDeref issues in S3Utils.
(cherry picked from commit debcbcc1454789936407583fe0aba8e158b16cad)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04efdce9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04efdce9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04efdce9
Branch: refs/heads/4.5
Commit: 04efdce9014ec60f7df8b77402b7dc39cc263ca4
Parents: 76674c4
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Thu Mar 5 11:58:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Mar 5 12:49:38 2015 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/S3Utils.java | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04efdce9/utils/src/com/cloud/utils/S3Utils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
index 6784587..ae7a453 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;
-
- 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,