[openrtm-commit:02763] r1023 - in branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . port

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-08-22 10:56:56 +0900 (Tue, 22 Aug 2017)
New Revision: 1023

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java
Log:
[merge] r977-979 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-08-18 08:40:26 UTC (rev 1022)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2017-08-22 01:56:56 UTC (rev 1023)
@@ -3628,6 +3628,7 @@
                 str = name_prop._dump(str,name_prop,0);
                 rtcout.println(Logbuf.DEBUG, str);
                 config_fname.add(m_config.getProperty(name_conf));
+                conff.close();
             } catch (FileNotFoundException e) {
                 rtcout.println(Logbuf.DEBUG, 
                     "Exception: Caught FileNotFoundException"
@@ -3662,9 +3663,8 @@
         if (!(m_config.getProperty(type_conf) == null
                 || m_config.getProperty(type_conf).length() == 0)) {
             
-            BufferedReader conff;
             try {
-                conff = new BufferedReader(
+                BufferedReader conff = new BufferedReader(
                         new FileReader(m_config.getProperty(type_conf)));
                 type_prop.load(conff);
                 rtcout.println(Logbuf.INFO,
@@ -3675,6 +3675,7 @@
                 str = type_prop._dump(str,type_prop,0);
                 rtcout.println(Logbuf.DEBUG,str);
                 config_fname.add(m_config.getProperty(type_conf));
+                conff.close();
                 
             } catch (FileNotFoundException e) {
                 rtcout.println(Logbuf.DEBUG, 
@@ -3689,7 +3690,7 @@
                     +" in Manager.configureComponent() type_conf.");
                 rtcout.println(Logbuf.DEBUG, e.getMessage());
                 e.printStackTrace();
-            }
+            } 
         }
         if (m_config.findNode(category + "." + type_name) != null) {
             Properties temp = m_config.getNode(category + "." + type_name);

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java	2017-08-18 08:40:26 UTC (rev 1022)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/SharedMemory.java	2017-08-22 01:56:56 UTC (rev 1023)
@@ -146,6 +146,7 @@
             try{
                 RandomAccessFile file = new RandomAccessFile(address, "rw");
                 file.setLength(m_memory_size);
+                file.close();
             }
             catch(Exception ex) {
                 rtcout.println(Logbuf.ERROR,"Open error  "+ex.toString() );
@@ -215,6 +216,7 @@
             try{
                 RandomAccessFile file = new RandomAccessFile(address, "rw");
                 file.setLength(m_memory_size);
+                file.close();
             }
             catch(Exception ex) {
                 rtcout.println(Logbuf.ERROR,"Open error  "+ex.toString() );