From c6a87d681685b6471dbea076ac302227aac11dd3 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Mon, 18 Aug 2014 11:47:57 -0700
Subject: [PATCH] Handle null Content-MD5 in response

---
 src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index d27f1b6..7232fb2 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -779,9 +779,11 @@ final class S3ProxyHandler extends AbstractHandler {
         response.addHeader(HttpHeaders.CONTENT_LENGTH,
                 contentMetadata.getContentLength().toString());
         response.setContentType(contentMetadata.getContentType());
-        response.addHeader(HttpHeaders.CONTENT_MD5,
-                BaseEncoding.base64().encode(
-                        contentMetadata.getContentMD5AsHashCode().asBytes()));
+        HashCode contentMd5 = contentMetadata.getContentMD5AsHashCode();
+        if (contentMd5 != null) {
+            response.addHeader(HttpHeaders.CONTENT_MD5,
+                    BaseEncoding.base64().encode(contentMd5.asBytes()));
+        }
         Date expires = contentMetadata.getExpires();
         if (expires != null) {
             response.addDateHeader(HttpHeaders.EXPIRES, expires.getTime());