[openrtm-commit:02283] r2881 - branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: sec_fukai
Date: 2017-01-20 16:31:55 +0900 (Fri, 20 Jan 2017)
New Revision: 2881

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
Log:
[compat,->DEV_IQ_2016]Delete dead code. refs #3798

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-19 09:42:45 UTC (rev 2880)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-20 07:31:55 UTC (rev 2881)
@@ -62,7 +62,6 @@
     if (size < 4)
       {
         return false;
-        throw CORBA::MARSHAL(0, CORBA::COMPLETED_NO);
       }
 
     const char* p = iorstr;
@@ -70,7 +69,6 @@
     if (p[0] != 'I' || p[1] != 'O' || p[2] != 'R' || p[3] != ':')
       {
         return false;
-        throw CORBA::MARSHAL(0, CORBA::COMPLETED_NO);
       }
 
     // IOR:xxyyzz......

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp	2017-01-19 09:42:45 UTC (rev 2880)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp	2017-01-20 07:31:55 UTC (rev 2881)
@@ -46,7 +46,6 @@
     if (m_buffer == 0 || m_consumer == 0)
       {
         throw std::bad_alloc();
-        return;
       }
     m_buffer->init(info.properties.getNode("buffer"));
     m_consumer->setBuffer(m_buffer);