From 6da0c84101c506e59a40998210651814ceccca47 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@maginatics.com>
Date: Tue, 8 Jan 2013 16:40:31 -0800
Subject: [PATCH] Ignore ETags with non-hex suffixes

Amazon S3 blobs created via multi-part uploads have these suffixes.
Reference:

https://forums.aws.amazon.com/thread.jspa?messageID=203510
---
 .../main/java/org/jclouds/s3/xml/ListBucketHandler.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java
index 1905eb5c04..193c64b70a 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java
@@ -22,6 +22,7 @@ import static com.google.common.io.BaseEncoding.base16;
 import static org.jclouds.http.Uris.uriBuilder;
 import static org.jclouds.util.SaxUtils.currentOrNull;
 
+import java.util.regex.Pattern;
 import javax.inject.Inject;
 
 import org.jclouds.date.DateService;
@@ -64,6 +65,9 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
    private String delimiter;
    private boolean isTruncated;
 
+   /** Some blobs have a non-hex suffix when created by multi-part uploads such Amazon S3. */
+   private static final Pattern MULTIPART_BLOB_ETAG = Pattern.compile("[0-9a-f]+-[0-9]+");
+
    @Inject
    public ListBucketHandler(DateService dateParser) {
       this.dateParser = dateParser;
@@ -99,7 +103,10 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
       } else if (qName.equals("ETag")) {
          String currentETag = currentOrNull(currentText);
          builder.eTag(currentETag);
-         builder.contentMD5(base16().lowerCase().decode(Strings2.replaceAll(currentETag, '"', "")));
+         currentETag = Strings2.replaceAll(currentETag, '"', "");
+         if (!MULTIPART_BLOB_ETAG.matcher(currentETag).matches()) {
+            builder.contentMD5(base16().lowerCase().decode(currentETag));
+         }
       } else if (qName.equals("Size")) {
          builder.contentLength(Long.valueOf(currentOrNull(currentText)));
       } else if (qName.equals("Owner")) {