fixed modifyng root node

1 files changed, 10 insertions, 3 deletions

diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c
index ae4de06f..1bcbc401 100644
--- a/lasso/id-wsf/data_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -726,7 +726,14 @@ lasso_data_service_build_modify_response_msg(LassoDataService *service)
 		if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr) {
 			xmlNode *node = xpathObj->nodesetval->nodeTab[0];
 			if (node != NULL) {
-				xmlReplaceNode(node, newNode);
+				/* If we must replace the root element, change it in the xmlDoc */
+				if (node == cur_data) {
+					xmlDocSetRootElement(doc, newNode);					
+					xmlFreeNode(cur_data);
+					cur_data = NULL;
+				} else {
+					xmlReplaceNode(node, newNode);
+				}
 			}
 		} else {
 			res = LASSO_DST_ERROR_MODIFY_FAILED;
@@ -735,10 +742,10 @@ lasso_data_service_build_modify_response_msg(LassoDataService *service)
 		xpathObj = NULL;
 	}
 
-	if (res == 0) {
+	if (res == 0 && doc->children != NULL) {
 		/* Save new service resource data */
 		xmlFreeNode(service->resource_data);
-		service->resource_data = xmlCopyNode(cur_data, 1);
+		service->resource_data = xmlCopyNode(doc->children, 1);
 	}
 
 	xmlXPathFreeContext(xpathCtx);