GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — CLOUDSTACK-8703: Fixed issue when listing directory on S3, it would o… · enterdevstudio/cloudstack@58c6a8d

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

utils/src/com/cloud/utils
- S3Utils.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎utils/src/com/cloud/utils/S3Utils.java‎`

Copy file name to clipboardExpand all lines: utils/src/com/cloud/utils/S3Utils.java

+8-3Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,10 +343,15 @@ private static List<S3ObjectSummary> listDirectory(final String bucketName, fina`
`343`	`343`	`ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + SEPARATOR);`
`344`	`344`
`345`	`345`	`ObjectListing ol = client.listObjects(listObjectsRequest);`
`346`		`- while (ol != null && ol.isTruncated()) {`
	`346`	`+ if(ol.isTruncated()) {`
	`347`	`+ do {`
	`348`	`+ objects.addAll(ol.getObjectSummaries());`
	`349`	`+ listObjectsRequest.setMarker(ol.getNextMarker());`
	`350`	`+ ol = client.listObjects(listObjectsRequest);`
	`351`	`+ } while (ol.isTruncated());`
	`352`	`+ }`
	`353`	`+ else {`
`347`	`354`	`objects.addAll(ol.getObjectSummaries());`
`348`		`- listObjectsRequest.setMarker(ol.getNextMarker());`
`349`		`- ol = client.listObjects(listObjectsRequest);`
`350`	`355`	`}`
`351`	`356`
`352`	`357`	`if (objects.isEmpty()) {`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.