From af00617b993a42614cd5793e2b186f390c6f7893 Mon Sep 17 00:00:00 2001
From: Arthur Baars <arthur@semmle.com>
Date: Thu, 5 May 2016 15:49:14 +0100
Subject: [PATCH] Blobwriter: call BlobWriter.Size after BlobWriter.Close

Signed-off-by: Arthur Baars <arthur@semmle.com>
---
 docs/handlers/blobupload.go | 5 +----
 docs/storage/blobwriter.go  | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/handlers/blobupload.go b/docs/handlers/blobupload.go
index 673e2c59..b403a167 100644
--- a/docs/handlers/blobupload.go
+++ b/docs/handlers/blobupload.go
@@ -134,7 +134,6 @@ func (buh *blobUploadHandler) StartBlobUpload(w http.ResponseWriter, r *http.Req
 	}
 
 	buh.Upload = upload
-	defer buh.Upload.Close()
 
 	if err := buh.blobUploadResponse(w, r, true); err != nil {
 		buh.Errors = append(buh.Errors, errcode.ErrorCodeUnknown.WithDetail(err))
@@ -224,11 +223,8 @@ func (buh *blobUploadHandler) PutBlobUploadComplete(w http.ResponseWriter, r *ht
 		return
 	}
 
-	size := buh.Upload.Size()
-
 	desc, err := buh.Upload.Commit(buh, distribution.Descriptor{
 		Digest: dgst,
-		Size:   size,
 
 		// TODO(stevvooe): This isn't wildly important yet, but we should
 		// really set the mediatype. For now, we can let the backend take care
@@ -293,6 +289,7 @@ func (buh *blobUploadHandler) blobUploadResponse(w http.ResponseWriter, r *http.
 	// TODO(stevvooe): Need a better way to manage the upload state automatically.
 	buh.State.Name = buh.Repository.Named().Name()
 	buh.State.UUID = buh.Upload.ID()
+	buh.Upload.Close()
 	buh.State.Offset = buh.Upload.Size()
 	buh.State.StartedAt = buh.Upload.StartedAt()
 
diff --git a/docs/storage/blobwriter.go b/docs/storage/blobwriter.go
index 3387bafb..48ac8a75 100644
--- a/docs/storage/blobwriter.go
+++ b/docs/storage/blobwriter.go
@@ -58,6 +58,7 @@ func (bw *blobWriter) Commit(ctx context.Context, desc distribution.Descriptor)
 	}
 
 	bw.Close()
+	desc.Size = bw.Size()
 
 	canonical, err := bw.validateBlob(ctx, desc)
 	if err != nil {