fixup! CA-419908: Update xenstore watcher to refresh domains when VM is renamed

Author: minglumlu

ocaml/libs/ezxenstore/watch/ez_xenstore_watch.ml

@@ -200,17 +200,17 @@ module Make (Debug : DEBUG) = struct
               in
 
               let process_one_watch c (path, _token) =
-                if path = _introduceDomain || path = _releaseDomain then (
+                if
+                  Atomic.exchange need_refresh_domains false
+                  || path = _introduceDomain
+                  || path = _releaseDomain
+                then
                   look_for_different_domains () ;
-                  Atomic.set need_refresh_domains false
-                ) else (
-                  if Atomic.exchange need_refresh_domains false then
-                    look_for_different_domains () ;
+                if path <> _introduceDomain && path <> _releaseDomain then
                   Client.immediate c (fun h ->
                       let xs = Xs.ops h in
                       Actions.watch_fired xc xs path !domains !watches
                   )
-                )
               in
 
               let register_for_watches () =