[openrtm-commit:03378] r3450 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-21 12:06:12 +0900 (Wed, 21 Nov 2018)
New Revision: 3450

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
Log:
[compat, bugfix]

Modified: trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-11-20 09:59:00 UTC (rev 3449)
+++ trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-11-21 03:06:12 UTC (rev 3450)
@@ -158,10 +158,7 @@
     RTC_DEBUG(("remove_member(id = %s)", id));
     for (MemIt it(m_rtcMembers.begin()); it != m_rtcMembers.end();)
       {
-		CORBA::Boolean result;
-		result = ::SDOPackage::Organization_impl::remove_member(id);
 
-
         Member& member(*it);
 		size_t len = max(strlen(id), strlen(member.profile_->instance_name));
         if (strncmp(id, member.profile_->instance_name, len))
@@ -178,12 +175,15 @@
         removeOrganizationFromTarget(member);
         startOwnedEC(member);
         it = m_rtcMembers.erase(it);
-		
-		return result;
+		break;
+
       }
+
+    CORBA::Boolean result;
+    result = ::SDOPackage::Organization_impl::remove_member(id);
 	
     
-	return false;
+    return result;
   }
 
   /*!