Merge pull request #41274 from thaJeztah/19.03_backport_Double_RLock

tiborvass · web-flow · commit 3087b3114fa5 · 2020-07-28T14:27:10.000+02:00
[19.03 backport] plugin: fix a double RLock bug
Upstream-commit: 22c458b67c58945e3310cd1a814dbacdc4c67c92
Component: engine
diff --git a/components/engine/plugin/store.go b/components/engine/plugin/store.go
@@ -188,9 +188,7 @@ func (ps *Store) GetAllByCap(capability string) ([]plugingetter.CompatPlugin, er
 	 * bypassing the daemon. For such tests, this check is necessary.
 	 */
 	if ps != nil {
-		ps.RLock()
 		result = ps.getAllByCap(capability)
-		ps.RUnlock()
 	}
 
 	// Lookup with legacy model

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,7 @@ func (ps *Store) GetAllByCap(capability string) ([]plugingetter.CompatPlugin, er`
`188`	`188`	`* bypassing the daemon. For such tests, this check is necessary.`
`189`	`189`	`*/`
`190`	`190`	`if ps != nil {`
`191`		`- ps.RLock()`
`192`	`191`	`result = ps.getAllByCap(capability)`
`193`		`- ps.RUnlock()`
`194`	`192`	`}`
`195`	`193`
`196`	`194`	`// Lookup with legacy model`