[openrtm-commit:01039] r705 - trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: ga
Date: 2013-04-06 19:46:47 +0900 (Sat, 06 Apr 2013)
New Revision: 705

Modified:
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
Log:
Modified for LogicalTimeTriggeredEC

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2013-03-05 17:51:10 UTC (rev 704)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2013-04-06 10:46:47 UTC (rev 705)
@@ -212,8 +212,7 @@
                 }
                 file = new File(fullClassName);
                 if(file.isAbsolute()){
-                    URLClassLoader url 
-                            = createURLClassLoader(file.getParent());
+                    URLClassLoader url = createURLClassLoader(file.getParent());
                     if(url!=null){
                         String name = file.getName();
                         name = getModuleName(name);
@@ -345,10 +344,8 @@
         try{
             URI uri = path.toURI();
             urls[0] = uri.toURL();
-        }
-        catch(java.net.MalformedURLException ex){
-            rtcout.println(Logbuf.WARN, 
-                "java.net.MalformedURLException: toURL() threw Exception."+ex);
+        } catch(java.net.MalformedURLException ex){
+            rtcout.println(Logbuf.WARN, "java.net.MalformedURLException: toURL() threw Exception."+ex);
             return null;
         }
         URLClassLoader url = new URLClassLoader(urls);
@@ -485,7 +482,7 @@
         //
         Method initMethod;
         try {
-            initMethod = target.getMethod(method_name);
+            initMethod = target.getMethod(method_name, null);
         } catch (SecurityException e) {
             throw e;
         } catch (NoSuchMethodException e) {

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2013-03-05 17:51:10 UTC (rev 704)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2013-04-06 10:46:47 UTC (rev 705)
@@ -6325,7 +6325,8 @@
                  Iterator it = avail_ec.iterator();
                  while (it.hasNext()) {
                      if(it.next().equals(ec_type)){
-                         find_flag= true; 
+                         find_flag= true;
+                         break;
                      }
                  }
                  if (!find_flag) {