Fix signal being fired before object exists

VictorNicollet · Apr 11, 2013 · 329f047 · 329f047
1 parent bad42fe
commit 329f047
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ohmCouchVersioned/ohmCouchVersioned.ml b/ohmCouchVersioned/ohmCouchVersioned.ml
@@ -284,12 +284,15 @@ module Make = functor (Versioned:VERSIONED) -> struct
       method diffs = diffs
     end in
 
-    let! () = ohm begin 
-      let! () = ohm $ Run.edit_context Versioned.couchDB (VersionTable.set vid version) in
-      Signals.version_create_call (vid,version)
-    end in
+    let! () = ohm (Run.edit_context Versioned.couchDB (VersionTable.set vid version)) in
+
+    let! result = ohm_req_or (return None) (refresh ~latest:(vid,version) id default) in
+
+    (* The refresh might create the object, so wait until after the refresh to call
+       any relevant signals. *)
+    let! () = ohm (Signals.version_create_call (vid,version)) in
 
-    refresh ~latest:(vid,version) id default
+    return (Some result) 
 
   let update ~id ~diffs ~info () = 
     do_update ~id ~default:None ~diffs ~info ()