[openrtm-commit:02065] r856 - 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-16 20:09:35 +0900 (Sun, 16 Oct 2016)
New Revision: 856

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

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java	2016-10-16 04:46:27 UTC (rev 855)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java	2016-10-16 11:09:35 UTC (rev 856)
@@ -186,7 +186,6 @@
         rtcout.println(Logbuf.TRACE, "write()");
         try{
             RandomAccessFile file = new RandomAccessFile(SHARED_NAME+m_shm_address, "rw");
-//file.setLength(m_memory_size);
             FileChannel channel = file.getChannel();
             int length = (int)channel.size();
             MappedByteBuffer buffer
@@ -194,7 +193,7 @@
             buffer.order(ByteOrder.LITTLE_ENDIAN);
 
 
-            LongHolder len = new LongHolder(data.value.length);
+            org.omg.CORBA.LongHolder len = new org.omg.CORBA.LongHolder(data.value.length);
             EncapsOutputStreamExt cdr 
                 = new EncapsOutputStreamExt(ORBUtil.getOrb(),true);
             len._write(cdr);
@@ -239,9 +238,9 @@
                 = new EncapsOutputStreamExt(ORBUtil.getOrb(),true);
             cdr.write_octet_array(len_data, 0, len_data.length);
             InputStream instream = cdr.create_input_stream();
-            LongHolder len = new LongHolder();
+            org.omg.CORBA.LongHolder len = new org.omg.CORBA.LongHolder();
             len._read(instream);
-            data.value = new byte[(int)len.value.intValue()];
+            data.value = new byte[(int)len.value];
             buffer.get(data.value);
             //buffer.get(data.value,8,data.value.length);
             channel.close();