Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1157 from andrewgaul/ignore-etag-non-hex-suffix 

Ignore ETags with non-hex suffixes
This commit is contained in:
Adrian Cole 2013-01-08 20:51:52 -08:00
parent 24c10f087a 6da0c84101
commit e7595d9d79
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java
View File

@ -22,6 +22,7 @@ import static com.google.common.io.BaseEncoding.base16;
import static org.jclouds.http.Uris.uriBuilder; import static org.jclouds.http.Uris.uriBuilder;
import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.currentOrNull;
import java.util.regex.Pattern;
import javax.inject.Inject; import javax.inject.Inject;
import org.jclouds.date.DateService; import org.jclouds.date.DateService;
@ -64,6 +65,9 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
private String delimiter; private String delimiter;
private boolean isTruncated; 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 @Inject
public ListBucketHandler(DateService dateParser) { public ListBucketHandler(DateService dateParser) {
this.dateParser = dateParser; this.dateParser = dateParser;
@ -99,7 +103,10 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
} else if (qName.equals("ETag")) { } else if (qName.equals("ETag")) {
String currentETag = currentOrNull(currentText); String currentETag = currentOrNull(currentText);
builder.eTag(currentETag); 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")) { } else if (qName.equals("Size")) {
builder.contentLength(Long.valueOf(currentOrNull(currentText))); builder.contentLength(Long.valueOf(currentOrNull(currentText)));
} else if (qName.equals("Owner")) { } else if (qName.equals("Owner")) {