shithub: hugo

Info  •  Files  •  Log  •  Branches

tpl/partials: Fix the lock contention in cached partial

Fixes #4086

--- a/tpl/partials/partials.go

+++ b/tpl/partials/partials.go

@@ -120,19 +120,17 @@

 		return p, nil

 	}

-	ns.cachedPartials.Lock()

-	defer ns.cachedPartials.Unlock()

-

-	// Double-check.

-	if p, ok = ns.cachedPartials.p[key]; ok {

-		return p, nil

-	}

-

 	p, err := ns.Include(name, context)

 	if err != nil {

 		return nil, err

 	}

+	ns.cachedPartials.Lock()

+	defer ns.cachedPartials.Unlock()

+	// Double-check.

+	if p2, ok := ns.cachedPartials.p[key]; ok {

+		return p2, nil

+	}

 	ns.cachedPartials.p[key] = p

 	return p, nil

-- 

⑨