luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Remove some deferring

Browse source
This commit is contained in:
Jeff Mitchell 2016-04-28 21:29:51 +00:00
parent fa0d389a95
commit 7f3613cc6e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builtin/logical/transit/lock_manager.go
View file

@ -217,12 +217,12 @@ func (lm *lockManager) getPolicyCommon(storage logical.Storage, name string, ups
// Reload the policy with the write lock to ensure we still need the upgrade
p, err = lm.getStoredPolicy(storage, name)
if err != nil {
defer lm.UnlockPolicy(name, exclusive)
lm.UnlockPolicy(name, exclusive)
return
}
if p == nil {
defer lm.UnlockPolicy(name, exclusive)
err = fmt.Errorf("error reloading policy for upgrade")
lm.UnlockPolicy(name, exclusive)
return
}
@ -300,7 +300,7 @@ func (lm *lockManager) RefreshPolicy(storage logical.Storage, name string) (p *P
p, err = lm.getStoredPolicy(storage, name)
if err != nil {
defer lm.UnlockPolicy(name, exclusive)
lm.UnlockPolicy(name, exclusive)
return
}