Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-02-23 02:01:08 +0000
committerslewis2009-02-23 02:01:08 +0000
commit1e242318f6a9132c83bbae3ae07f182b236f5433 (patch)
tree20d6a283c57d2bb09a99eb0597fb89d311499247 /providers
parent8f6d8d483749d65b6798b5348ff63d5c7d4624b8 (diff)
downloadorg.eclipse.ecf-1e242318f6a9132c83bbae3ae07f182b236f5433.tar.gz
org.eclipse.ecf-1e242318f6a9132c83bbae3ae07f182b236f5433.tar.xz
org.eclipse.ecf-1e242318f6a9132c83bbae3ae07f182b236f5433.zip
Additions for RFC 119 support. See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=249240#c11
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java
index ddcbdf928..97e37c53a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java
@@ -589,17 +589,20 @@ final class R_OSGiRemoteServiceContainer implements IRemoteServiceContainerAdapt
if (serviceId == null)
return null;
ID cID = serviceId.getContainerID();
+ // If the container ID isn't relevant to us we ignore
if (cID instanceof R_OSGiID) {
+ // If it's not the same as who we're connected to, we ignore
if (cID.equals(getConnectedID())) {
final String filter = "(" + Constants.SERVICE_ID + "=" + serviceId + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
try {
+ // Get remote service references...I imagine this can/would block
RemoteServiceReference[] refs = remoteService.getRemoteServiceReferences(((R_OSGiID) cID).getURI(), null, context.createFilter(filter));
- // Refs should be null or one long
+ // There should be either zero or 1 remote service reference
if (refs == null || refs.length == 0)
return null;
return new RemoteServiceReferenceImpl(createRemoteServiceID(refs[0]), refs[0]);
} catch (InvalidSyntaxException e) {
- // shouldn't happen
+ // shouldn't happen as filter better be well formed
return null;
}
}

Back to the top