Merge pull request #4218 from fosscel/fix-s3-continuation

mikeprimm · web-flow · commit 140b6ea242c3 · 2025-07-08T22:06:18.000-04:00
fix (s3): use correct continuation token
diff --git a/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java
@@ -407,7 +407,7 @@ private void processEnumMapTiles(DynmapWorld world, MapType map, ImageVariant va
 	    		}
 	    		if (result.isTruncated()) {	// If more, build continuiation request
 	    	    	req = ListObjectsV2Request.builder().bucketName(bucketname)
-	    	    			.prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getContinuationToken()).encodingType("url").requestPayer("requester").build();
+	    	    			.prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getNextContinuationToken()).encodingType("url").requestPayer("requester").build();
 	    		}
 	    		else {	// Else, we're done
 	    			done = true;
@@ -480,7 +480,7 @@ private void processPurgeMapTiles(DynmapWorld world, MapType map, ImageVariant v
 	    		}
 	    		if (result.isTruncated()) {	// If more, build continuiation request
 	    	    	req = ListObjectsV2Request.builder().bucketName(bucketname)
-	    	    			.prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getContinuationToken()).encodingType("url").requestPayer("requester").build();
+	    	    			.prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getNextContinuationToken()).encodingType("url").requestPayer("requester").build();
 	    		}
 	    		else {	// Else, we're done
 	    			done = true;

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ private void processEnumMapTiles(DynmapWorld world, MapType map, ImageVariant va`
`407`	`407`	`}`
`408`	`408`	`if (result.isTruncated()) { // If more, build continuiation request`
`409`	`409`	`req = ListObjectsV2Request.builder().bucketName(bucketname)`
`410`		`- .prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getContinuationToken()).encodingType("url").requestPayer("requester").build();`
	`410`	`+ .prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getNextContinuationToken()).encodingType("url").requestPayer("requester").build();`
`411`	`411`	`}`
`412`	`412`	`else { // Else, we're done`
`413`	`413`	`done = true;`
`@@ -480,7 +480,7 @@ private void processPurgeMapTiles(DynmapWorld world, MapType map, ImageVariant v`
`480`	`480`	`}`
`481`	`481`	`if (result.isTruncated()) { // If more, build continuiation request`
`482`	`482`	`req = ListObjectsV2Request.builder().bucketName(bucketname)`
`483`		`- .prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getContinuationToken()).encodingType("url").requestPayer("requester").build();`
	`483`	`+ .prefix(basekey).delimiter("").maxKeys(1000).continuationToken(result.getNextContinuationToken()).encodingType("url").requestPayer("requester").build();`
`484`	`484`	`}`
`485`	`485`	`else { // Else, we're done`
`486`	`486`	`done = true;`