[openrtm-commit:00899] r360 - trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-10-17 17:45:35 +0900 (Wed, 17 Oct 2012)
New Revision: 360

Modified:
   trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
Log:
Update RtsProfile Restore

Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java	2012-10-10 13:29:18 UTC (rev 359)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java	2012-10-17 08:45:35 UTC (rev 360)
@@ -1084,9 +1084,10 @@
 							// void
 						}
 					} else {
-						if (!KEY_BEND_POINT.equals(name)) {
-							conn.setProperty(name, value);
+						if (isIOR(value) || KEY_BEND_POINT.equals(name)) {
+							continue;
 						}
+						conn.setProperty(name, value);
 					}
 				}
 			}
@@ -1110,7 +1111,8 @@
 			if (connBase instanceof ServiceportConnectorExt) {
 				ServiceportConnectorExt connExt = (ServiceportConnectorExt) connBase;
 				for (Property p : connExt.getProperties()) {
-					if (KEY_BEND_POINT.equals(p.getName())) {
+					if (isIOR(p.getValue())
+							|| KEY_BEND_POINT.equals(p.getName())) {
 						continue;
 					}
 					eConnProf.setProperty(p.getName(), p.getValue());
@@ -1121,6 +1123,10 @@
 					connBase.getSourceServicePort(), getBendPoint(connBase));
 		}
 	}
+	
+	private boolean isIOR(String value) {
+		return (value != null && value.startsWith("IOR:"));
+	}
 
 	// ベンドポイントをプロパティから復元する
 	private Map<Integer, Point> getBendPoint(DataportConnector connBase) {