[openrtm-commit:02042] r2774 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-10-12 12:10:39 +0900 (Wed, 12 Oct 2016)
New Revision: 2774

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
   trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
Log:
[compat,RELENG_1_2]refs #3656

Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2016-10-07 07:43:42 UTC (rev 2773)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2016-10-12 03:10:39 UTC (rev 2774)
@@ -19,9 +19,9 @@
 	echo '// This header file is automatically generated.' > $@
 	echo '// Do not edit this file.' >> $@
 	echo '' >> $@
-	echo 'const char* openrtm_name    = "'${PACKAGE}'-'${VERSION}'";' >> $@
-	echo 'const char* openrtm_version = "'${VERSION}'";' >> $@
-	echo 'const char* corba_name      = "'${ORB}'";' >> $@
+	echo 'static const char* openrtm_name    = "'${PACKAGE}'-'${VERSION}'";' >> $@
+	echo 'static const char* openrtm_version = "'${VERSION}'";' >> $@
+	echo 'static const char* corba_name      = "'${ORB}'";' >> $@
 
 version.txt:
 	echo 'name = '${PACKAGE}'-'${VERSION} >> $@

Modified: trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2016-10-07 07:43:42 UTC (rev 2773)
+++ trunk/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2016-10-12 03:10:39 UTC (rev 2774)
@@ -21,6 +21,7 @@
 #include <rtm/SdoConfiguration.h>
 #include <rtm/CORBA_SeqUtil.h>
 #include <rtm/Manager.h>
+#include <rtm/DefaultConfiguration.h>
 #include <coil/stringutil.h>
 #include <iostream>
 #include <typeinfo>
@@ -2736,6 +2737,29 @@
         m_eclist.push_back(ec);
         ec->bindComponent(this);
       }
+
+
+	if (m_eclist.empty())
+	{
+	
+		coil::Properties prop;
+		prop.setDefaults(default_config);
+		RTC::ExecutionContextBase* ec = NULL;
+		ec = RTC::ExecutionContextFactory::
+			instance().createObject(prop["exec_cxt.periodic.type"].c_str());
+		if (ec == NULL)
+		{
+			RTC_ERROR(("EC (%s) creation failed.", prop["exec_cxt.periodic.type"].c_str()));
+			RTC_DEBUG(("Available EC list: %s",
+				coil::flatten(avail_ec).c_str()));
+			ret = RTC::RTC_ERROR;
+		}
+		
+		
+		ec->init(coil::Properties());
+		m_eclist.push_back(ec);
+		ec->bindComponent(this);
+	}
     return ret;
   }