mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix deadlock when state TMVar is empty

Browse source
This commit is contained in:
Joey Hess 2013-12-27 13:17:22 -04:00
parent 3cd8f1bb13
commit fa6f404a5f
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/External.hs
View file

@ -266,7 +266,9 @@ fromExternal lck external extractor a =
go (Just st) = run st go (Just st) = run st
go Nothing = do go Nothing = do
st <- startExternal $ externalType external st <- startExternal $ externalType external
void $ liftIO $ atomically $ swapTMVar v st void $ liftIO $ atomically $ do
void $ tryReadTMVar v
putTMVar v st
{- Handle initial protocol startup; check the VERSION {- Handle initial protocol startup; check the VERSION
- the remote sends. -} - the remote sends. -}