[openrtm-commit:02045] r848 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-10-12 23:39:15 +0900 (Wed, 12 Oct 2016)
New Revision: 848

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMProvider.java
Log:
Fixed  bugs. refs #3395

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMProvider.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMProvider.java	2016-10-12 14:21:26 UTC (rev 847)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortSHMProvider.java	2016-10-12 14:39:15 UTC (rev 848)
@@ -1,5 +1,7 @@
 package jp.go.aist.rtm.RTC.port;
 
+import java.util.UUID;
+
 import jp.go.aist.rtm.RTC.ObjectCreator;
 import jp.go.aist.rtm.RTC.ObjectDestructor;
 import jp.go.aist.rtm.RTC.OutPortProviderFactory;
@@ -66,6 +68,8 @@
         push_back(m_properties,
                   NVUtil.newNV("dataport.corba_cdr.outport_ref",
                                  m_objref, OpenRTM.PortSharedMemory.class ));
+
+        m_shm_address = UUID.randomUUID().toString();
     }
     /**
      * {@.ja 当該OpenRTM.PortSharedMemoryのCORBAオブジェクト参照を取得する。}
@@ -114,6 +118,8 @@
      *
      */
     public void init(Properties prop) {
+        String ds = prop.getProperty("shem_default_size");
+        m_memory_size = (int)m_shmem.string_to_MemorySize(ds);
     }
 
     /**
@@ -253,7 +259,7 @@
         final OutPortProviderFactory<OutPortProvider,String> factory 
             = OutPortProviderFactory.instance();
 
-        factory.addFactory("corba_cdr",
+        factory.addFactory("shared_memory",
                     new OutPortSHMProvider(),
                     new OutPortSHMProvider());
     
@@ -694,6 +700,7 @@
     private ConnectorListeners m_listeners;
     private ConnectorBase.ConnectorInfo m_profile;
 
+    private SharedMemory m_shmem = new SharedMemory();
     private String m_shm_address = new String();
     private int m_memory_size;
 }