[certi-cvs] certi/libCERTI ObjectSet.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/05/28 09:01:47

Modified files:
        libCERTI       : ObjectSet.cc 

Log message:
        Fix bug#26610 : rtig crashed when network error
        Solution is the one suggested by Zhiyu Tang

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.cc?cvsroot=certi&r1=3.22&r2=3.23

Patches:
Index: ObjectSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- ObjectSet.cc        10 Jun 2008 13:41:47 -0000      3.22
+++ ObjectSet.cc        28 May 2009 09:01:47 -0000      3.23
@@ -196,14 +196,17 @@
 ObjectSet::killFederate(FederateHandle the_federate)
     throw (RTIinternalError)
 {
-    std::map<ObjectHandle, Object *>::iterator i ;
-    for (i = begin(); i != end(); i++) {
+       std::map<ObjectHandle, Object *>::iterator i = begin();
+       while( i != end() ) {
         if ((i->second)->getOwner() == the_federate) {
             std::map<ObjectHandle, Object *>::erase(i);
             i = begin();
         }
+               else {
+                       i++;
+               }
     }
-}
+} /* end of killFederate */
 
 // ----------------------------------------------------------------------------
 bool
@@ -459,4 +462,4 @@
 }
 } // namespace certi
 
-// $Id: ObjectSet.cc,v 3.22 2008/06/10 13:41:47 rousse Exp $
+// $Id: ObjectSet.cc,v 3.23 2009/05/28 09:01:47 erk Exp $