Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-07-02 13:47:38 -0400
committerslewis2010-07-02 13:47:38 -0400
commit534a20e8b1238873eb1dde089c1bdf28684f7198 (patch)
tree2351f51b6cdb78cb84865b2070b9168563634fd5
parenta7871d4582fbfef07d41429278239aa8973e74b7 (diff)
downloadorg.eclipse.ecf-534a20e8b1238873eb1dde089c1bdf28684f7198.tar.gz
org.eclipse.ecf-534a20e8b1238873eb1dde089c1bdf28684f7198.tar.xz
org.eclipse.ecf-534a20e8b1238873eb1dde089c1bdf28684f7198.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=318756
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF
index 832a098bb..f02e3d7e7 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.provider.remoteservice;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.remoteservice.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 ea67b0779..c495d2449 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
@@ -160,6 +160,8 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getAllRemoteServiceReferences", new Object[] {clazz, filter}); //$NON-NLS-1$
final IRemoteServiceReference[] result = getRemoteServiceReferences((ID[]) null, clazz, filter);
Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "getAllRemoteServiceReferences", result); //$NON-NLS-1$
+ if (result == null)
+ return null;
return (result.length == 0) ? null : result;
}
@@ -227,8 +229,6 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
*/
public IRemoteServiceReference[] getRemoteServiceReferences(ID[] idFilter, String clazz, String filter) throws InvalidSyntaxException {
Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getRemoteServiceReferences", new Object[] {idFilter, clazz, filter}); //$NON-NLS-1$
- if (clazz == null)
- return null;
final IRemoteFilter remoteFilter = (filter == null) ? null : new RemoteFilterImpl(filter);
// Wait for pending updates from containers in idFilter
waitForPendingUpdates(idFilter, getAddRegistrationRequestTimeout());

Back to the top