| commit | 17a86f0d20a9ae66887c19e2c20a417978e2606c | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Mon Jun 20 23:41:20 2016 -0700 |
| committer | slewis <slewis@composent.com> | Mon Jun 20 23:41:20 2016 -0700 |
| tree | a49fe78dc74cd5ce74f28f5aa2a8020990071b8a | |
| parent | e6eba5c361e498c50fdc21c411eca88f6f537cc5 [diff] |
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=496441 with bundle version maintenance segment updated Change-Id: I9c0d9713307009eacb576ad67442665cc380dfa0
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF index c22a0de..088c67c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice -Bundle-Version: 8.10.0.qualifier +Bundle-Version: 8.10.1.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java index d56be65..8e05886 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java
@@ -133,16 +133,16 @@ } } // check the filter + List ret = new ArrayList(); if (remoteFilter != null) { for (int i = 0; i < result.size(); i++) { RemoteServiceClientReference ref = (RemoteServiceClientReference) result.get(i); - if (!remoteFilter.match(ref)) - result.remove(i); + if (remoteFilter == null || remoteFilter.match(ref)) + ret.add(ref); } } - if (result.size() > 0) { - RemoteServiceClientReference[] array = new RemoteServiceClientReference[result.size()]; - result.toArray(array); + if (ret.size() > 0) { + RemoteServiceClientReference[] array = (RemoteServiceClientReference[]) ret.toArray(new RemoteServiceClientReference[ret.size()]); return (array.length == 0) ? null : array; } return null;