Merge pull request #2279 from zli/CAR-483-cont

CAR-483 bug fix
xapi-project · Jul 8, 2015 · 592aeea · 592aeea
2 parents 132e382 + d462429
commit 592aeea
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ocaml/xapi/message_forwarding.ml b/ocaml/xapi/message_forwarding.ml
@@ -931,7 +931,9 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
 					with_global_lock
 						(fun () ->
 							finally_clear_host_operation ~__context ~host:suitable_host ?host_op ();
-							Db.VM.set_scheduled_to_be_resident_on ~__context ~self:vm ~value:Ref.null))
+							(* In certain cases, VM might have been destroyed as a consequence of operation *)
+							if Db.is_valid_ref __context vm then
+								Db.VM.set_scheduled_to_be_resident_on ~__context ~self:vm ~value:Ref.null))
 
 		(* Used by VM.start_on, VM.resume_on, VM.migrate to verify a host has enough resource and to
 		   'allocate_vm_to_host' (ie set the 'scheduled_to_be_resident_on' field) *)