Signed-off-by: Jon Ludlam <[email protected]>

 ocaml/xapi/rrd.ml |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


# HG changeset patch
# User Jonathan Ludlam <[email protected]>
# Date 1266422772 0
# Node ID 20f86371f8cb81ef917867a03f4727f41bb66418
# Parent  6518f562e9d3e1e30818c5cfa5b40c8a4220ce2c
CA-35110: Fix unmarshaling of RRDs

Signed-off-by: Jon Ludlam <[email protected]>

diff -r 6518f562e9d3 -r 20f86371f8cb ocaml/xapi/rrd.ml
--- a/ocaml/xapi/rrd.ml	Wed Feb 17 16:06:11 2010 +0000
+++ b/ocaml/xapi/rrd.ml	Wed Feb 17 16:06:12 2010 +0000
@@ -591,7 +591,9 @@
   let tree = 
     let data d = D d in
     let el ((prefix,tag_name),attr) children = El (tag_name, children) in
-    Xmlm.input_tree ~data ~el input
+    match Xmlm.peek input with
+    | `Dtd _ -> snd (Xmlm.input_doc_tree ~data ~el input)
+    | _ -> Xmlm.input_tree ~data ~el input
   in
 
   let kvs elts = List.filter_map 
_______________________________________________
xen-api mailing list
[email protected]
http://lists.xensource.com/mailman/listinfo/xen-api

Reply via email to