octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-14 09:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Re)Fix locking around deleteFile (fixes #64)

Browse Source
This commit is contained in:
Jakob Borg 2014-02-11 16:04:55 +01:00
parent 478300f6d8
commit a26ce61d92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/filequeue.go
View File

@ -221,6 +221,8 @@ func (q *FileQueue) SetAvailable(file string, nodes []string) {
func (q *FileQueue) RemoveAvailable(toRemove string) { func (q *FileQueue) RemoveAvailable(toRemove string) {
q.amut.Lock() q.amut.Lock()
q.fmut.Lock()
defer q.fmut.Unlock()
defer q.amut.Unlock() defer q.amut.Unlock()
for file, nodes := range q.availability { for file, nodes := range q.availability {
@ -228,9 +230,7 @@ func (q *FileQueue) RemoveAvailable(toRemove string) {
if node == toRemove { if node == toRemove {
q.availability[file] = nodes[:i+copy(nodes[i:], nodes[i+1:])] q.availability[file] = nodes[:i+copy(nodes[i:], nodes[i+1:])]
if len(q.availability[file]) == 0 { if len(q.availability[file]) == 0 {
q.fmut.Lock()
q.deleteFile(file) q.deleteFile(file)
q.fmut.Unlock()
} }
} }
break break