Merge branch 'master' into shared_balances

Conflicts:
	engine/accountlock.go
This commit is contained in:
Radu Ioan Fericean
2014-01-10 19:04:55 +02:00
7 changed files with 158 additions and 89 deletions

View File

@@ -82,6 +82,10 @@ func (cm *AccountLock) GuardMany(names []string, handler func() (float64, error)
}
lock <- true
reply, err = handler()
}
reply, err = handler()
for _, name := range names {
lock := AccLock.queue[name]
<-lock
}
return