[Xen-changelog] [xen master] oxenstored: fix del_watches and del_transactions

[patchbot@xxxxxxx]

commit d962aa44e4128ea677ce8407fc2483d94f007d91
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Wed Jun 17 20:39:49 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Jun 18 09:54:27 2015 +0100

    oxenstored: fix del_watches and del_transactions
    
    The statement to reset nb_watches should be in del_watches, not
    del_transactions.
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: David Scott <dave.scott@xxxxxxxxxx>
    Acked-by: David Scott <dave.scott@xxxxxxxxxx>
    [ ijc -- fix syntax error by adding a ";" to the previous line in the
             new location and removing from the previous line in the old ]
---
 tools/ocaml/xenstored/connection.ml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ocaml/xenstored/connection.ml 
b/tools/ocaml/xenstored/connection.ml
index 9de4978..0a2c481 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -187,11 +187,11 @@ let del_watch con path token =
        apath, w
 
 let del_watches con =
-  Hashtbl.clear con.watches
+  Hashtbl.clear con.watches;
+  con.nb_watches <- 0
 
 let del_transactions con =
-  Hashtbl.clear con.transactions;
-  con.nb_watches <- 0
+  Hashtbl.clear con.transactions
 
 let list_watches con =
        let ll = Hashtbl.fold 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog