[Cluster-devel] conga ./clustermon.spec.in.in ricci/modules/cl ...

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-12-13 19:14:54

Modified files:
	.              : clustermon.spec.in.in 
	ricci/modules/cluster/clumon/src/daemon: Monitor.cpp 

Log message:
	Improved bz218941: Conga/luci - cannot add node to cluster via luci web app

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/clustermon.spec.in.in	2006/11/17 20:39:42	1.24
+++ conga/clustermon.spec.in.in	2006/12/13 19:14:53	1.25
@@ -195,13 +195,13 @@
 
 %changelog
 
-* day month date 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.9.1-2
+* Tue Dec 12 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.9.1-2
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-- 
+- Improved bz218941: Conga/luci - cannot add node to cluster via luci web app
 
 
 
--- conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2006/10/24 14:56:56	1.12
+++ conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2006/12/13 19:14:54	1.13
@@ -269,7 +269,9 @@
   msg = generateXML(msg_xml);
   
   // return nodes - nodename
-  nodes.erase(find(nodes.begin(), nodes.end(), nodename));
+  vector<String>::iterator iter = find(nodes.begin(), nodes.end(), nodename);
+  if (iter != nodes.end())
+    nodes.erase(iter);
   return nodes;
 }