Merge pull request xapi-project#5359 from edwintorok/private/edvint/p…

…asyncbug2

CA-387699: Fix Protocol_async.with_lock bug spotted by Vincent

ocaml/message-switch/async/protocol_async.ml

@@ -81,14 +81,14 @@ module M = struct
       {m; c}
 
     let with_lock t f =
-      let rec wait state =
-        if Bool.(t.m = state) then
+      let rec wait () =
+        if Bool.(t.m = false) then (
+          t.m <- true ;
           return ()
-        else
-          Condition.wait t.c >>= fun () -> wait state
+        ) else
+          Condition.wait t.c >>= wait
       in
-      wait false >>= fun () ->
-      t.m <- true ;
+      wait () >>= fun () ->
       Monitor.protect f ~finally:(fun () ->
           t.m <- false ;
           Condition.broadcast t.c () ;