[sr-dev] git:master: modules_k/rls: Fixed a couple of merge errors that crept in during the splitting RLS NOTIFY development

[Peter Dunkley]

Module: sip-router
Branch: master
Commit: 2a4163498e6122d8ec65aa083b829a4657714a34
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a4163498e6122d8ec65aa083b829a4657714a34

Author: pd <peter.dunkley at crocodile-rcs.com>
Committer: pd <peter.dunkley at crocodile-rcs.com>
Date:   Tue Aug  2 14:22:16 2011 +0100

modules_k/rls: Fixed a couple of merge errors that crept in during the splitting RLS NOTIFY development

- Problem found by Paul Pankhurst and fixed by Andrew Miller

---

 modules_k/rls/resource_notify.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c
index 7a88970..254cf74 100644
--- a/modules_k/rls/resource_notify.c
+++ b/modules_k/rls/resource_notify.c
@@ -249,6 +249,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut
             len_est = create_empty_rlmi_doc(&rlmi_doc, &list_node, &dialog->pres_uri, dialog->version, 0);
             len_est += 2*strlen(boundary_string)+4+102+2+50+strlen(resource_uri)+20;
 			buf_len= 0;
+            resource_added = 0;
 
 			/* !!!! for now I will include the auth state without checking if 
 			 * it has changed - > in future chech if it works */		
@@ -265,6 +266,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut
         }
 		xmlNewProp(resource_node, BAD_CAST "uri", BAD_CAST resource_uri);
         len_est += strlen (resource_uri) + 35; /* <resource uri="[uri]"></resource>/r/n */
+        resource_added = 1;
 
 		/* there might be more records with the same uri- more instances-
 		 * search and add them all */
@@ -406,7 +408,7 @@ void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int aut
 
 	if(rlmi_doc)
 	{
-        LM_ERR("timer_send_notify at end len_est = %d resource_added = %d\n", len_est, resource_added);
+        LM_DBG("timer_send_notify at end len_est = %d resource_added = %d\n", len_est, resource_added);
         if (resource_added == 1)
         {
             send_notify(&rlmi_doc, buf, buf_len, bstr, dialog, hash_code);