X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2f66d4cc05e9442a9bb69969744d0750a02a1ed4..2af7b0336b2b92e38f6966b8bbc233c05704815d:/services/keep-web/cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 2ff2136ed7..eeb78ad905 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -144,14 +144,14 @@ var selectPDH = map[string]interface{}{
 func (c *cache) Update(client *arvados.Client, coll arvados.Collection, fs arvados.CollectionFileSystem) error {
 	c.setupOnce.Do(c.setup)
 
-	if m, err := fs.MarshalManifest("."); err != nil || m == coll.ManifestText {
+	m, err := fs.MarshalManifest(".")
+	if err != nil || m == coll.ManifestText {
 		return err
-	} else {
-		coll.ManifestText = m
 	}
+	coll.ManifestText = m
 	var updated arvados.Collection
 	defer c.pdhs.Remove(coll.UUID)
-	err := client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, nil, map[string]interface{}{
+	err = client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, nil, map[string]interface{}{
 		"collection": map[string]string{
 			"manifest_text": coll.ManifestText,
 		},
@@ -224,13 +224,12 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 				})
 			}
 			return collection, err
-		} else {
-			// PDH changed, but now we know we have
-			// permission -- and maybe we already have the
-			// new PDH in the cache.
-			if coll := c.lookupCollection(arv.ApiToken + "\000" + current.PortableDataHash); coll != nil {
-				return coll, nil
-			}
+		}
+		// PDH changed, but now we know we have
+		// permission -- and maybe we already have the
+		// new PDH in the cache.
+		if coll := c.lookupCollection(arv.ApiToken + "\000" + current.PortableDataHash); coll != nil {
+			return coll, nil
 		}
 	}