diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 06:20:53 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 06:20:53 +0000 |
commit | 60f5bce98ed1ce21b111c0d006d2dfd02106371b (patch) | |
tree | 1964272ea9422fd03f2e694ebbdca94b0132bd7d /sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java | |
parent | 734dac1eaf4ff319d8355d08335aeb019abf727e (diff) |
Update to the latest version of OSGi Remote Service Admin
Fix the issues to pass OSGi SCA configuration type TCK
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java index 84a7ba512e..433e22e543 100644 --- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java +++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java @@ -165,11 +165,11 @@ public final class EndpointPermission extends Permission { setTransients(null, parseActions(actions)); Map<String, Object> props; if ((localFrameworkUUID != null) - && localFrameworkUUID.equals(endpoint.getRemoteFrameworkUUID())) { + && localFrameworkUUID.equals(endpoint.getFrameworkUUID())) { props = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); props.putAll(endpoint.getProperties()); props.put(ENDPOINT_FRAMEWORK_UUID, new String[] { - endpoint.getRemoteFrameworkUUID(), "<<LOCAL>>"}); + endpoint.getFrameworkUUID(), "<<LOCAL>>"}); } else { props = endpoint.getProperties(); @@ -190,7 +190,7 @@ public final class EndpointPermission extends Permission { throw new IllegalArgumentException("invalid endpoint: null"); } StringBuffer sb = new StringBuffer("(" + ENDPOINT_ID + "="); - sb.append(endpoint.getRemoteID()); + sb.append(endpoint.getId()); sb.append(")"); return sb.toString(); } |