Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-04-23 03:02:21 +0000
committerslewis2014-04-23 03:02:21 +0000
commit59ce7c42983d9e2031ed5aa153a3f13fcff8349c (patch)
tree12b7c31dd02519d9f17f4ac27e317ef848ba09fc
parent4f63d371d2b371362d03742ff527c47dc146e588 (diff)
downloadorg.eclipse.ecf-59ce7c42983d9e2031ed5aa153a3f13fcff8349c.tar.gz
org.eclipse.ecf-59ce7c42983d9e2031ed5aa153a3f13fcff8349c.tar.xz
org.eclipse.ecf-59ce7c42983d9e2031ed5aa153a3f13fcff8349c.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=433264
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java2
2 files changed, 3 insertions, 1 deletions
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 586c29e59..c152c5e49 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 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservice
-Bundle-Version: 8.4.0.qualifier
+Bundle-Version: 8.4.100.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/RemoteServiceClientRegistration.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java
index f4ea5e9f3..e483ff458 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java
@@ -114,6 +114,8 @@ public class RemoteServiceClientRegistration implements IRemoteServiceRegistrati
for (int j = 0; j < subArray.length; j++) {
IRemoteCallable def = subArray[j];
String defMethod = def.getMethod();
+ if (defMethod != null && defMethod.equals(methodToFind))
+ return def;
String fqDefMethod = getFQMethod(className, defMethod);
if (fqDefMethod.equals(methodToFind))
return def;

Back to the top