Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-03-31 16:52:03 +0000
committerslewis2009-03-31 16:52:03 +0000
commit0a08bd84c615941eaefee283a13745a07f8b8910 (patch)
treef6cf2f7a5cbb72e8f4a65f72ba5ccd8a5db5cb06 /providers
parent2abdf81a8233812d1fbed39185138c1a85d005ee (diff)
downloadorg.eclipse.ecf-0a08bd84c615941eaefee283a13745a07f8b8910.tar.gz
org.eclipse.ecf-0a08bd84c615941eaefee283a13745a07f8b8910.tar.xz
org.eclipse.ecf-0a08bd84c615941eaefee283a13745a07f8b8910.zip
Modified RegistrySharedObject to handle null targetID in getRemoteServiceReferences(ID targetID...) method
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
index e59bdc86d..ea3344221 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
@@ -134,9 +134,15 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
* @since 3.0
*/
public IRemoteServiceReference[] getRemoteServiceReferences(ID targetID, String clazz, String filter) throws InvalidSyntaxException, ContainerConnectException {
+ // If no target specified, just search for all available references
+ if (targetID == null)
+ return getRemoteServiceReferences((ID[]) null, clazz, filter);
+ // If we're not already connected, then connect to targetID
+ // If we *are* already connected, then we do *not* connect to target, but rather just search for targetID/endpoint
if (!isConnected()) {
getContext().connect(targetID, connectContext);
}
+ // Now we're connected (or already were connected, so we look for remote service references for target
return getRemoteServiceReferences(new ID[] {targetID}, clazz, filter);
}

Back to the top