From 0613da2fcb640fa901a1a85c7146f41371cdee5d Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Fri, 17 Jul 2020 19:06:16 +0900 Subject: [PATCH] Handle empty list blobs with opaque markers (Azure) Fixes #326. --- src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java index 4bf9e97..799c4b8 100644 --- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java +++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java @@ -1460,8 +1460,11 @@ public class S3ProxyHandler { isListV2 ? "NextContinuationToken" : "NextMarker", encodeBlob(encodingType, nextMarker)); if (Quirks.OPAQUE_MARKERS.contains(blobStoreType)) { - lastKeyToMarker.put(Maps.immutableEntry(containerName, - Iterables.getLast(set).getName()), nextMarker); + StorageMetadata sm = Iterables.getLast(set, null); + if (sm != null) { + lastKeyToMarker.put(Maps.immutableEntry(containerName, + sm.getName()), nextMarker); + } } } else { writeSimpleElement(xml, "IsTruncated", "false");