diff options
| author | slewis | 2010-08-29 20:32:53 +0000 |
|---|---|---|
| committer | slewis | 2010-08-29 20:32:53 +0000 |
| commit | 7f2b20bd757df3620a837db2f8bd9cc48ea8dc38 (patch) | |
| tree | b6c75b6e44e51d671394747ef3ea99392b9333de | |
| parent | 9de8f864159a02ae5768cb5590ed10fdf3bbe21d (diff) | |
| download | org.eclipse.ecf-7f2b20bd757df3620a837db2f8bd9cc48ea8dc38.tar.gz org.eclipse.ecf-7f2b20bd757df3620a837db2f8bd9cc48ea8dc38.tar.xz org.eclipse.ecf-7f2b20bd757df3620a837db2f8bd9cc48ea8dc38.zip | |
Fix for ambiguity in handling of remote services when the connect target is not the same client ID as the service host.I-HEAD-platform_feature-67-2010_08_31
2 files changed, 7 insertions, 7 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 fe5a8c293..b2ba291df 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.4.0.qualifier +Bundle-Version: 3.3.200.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 e51fe8ce2..027aff628 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 @@ -85,20 +85,20 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer /** * ListenerQueue for asynchronously dispatching remote service registration/unregistration * events - * @since 3.4 + * @since 3.3 */ - protected ListenerQueue rsListenerDispatchQueue; + private ListenerQueue rsListenerDispatchQueue; /** * Queue lock so that rsListenerDispatchQueue above can be lazily instantiated - * @since 3.4 + * @since 3.3 */ - protected final Object rsQueueLock = new Object(); + private final Object rsQueueLock = new Object(); /** * EventManager for the rsListenerDispatchEventManager - * @since 3.4 + * @since 3.3 */ - protected EventManager rsListenerDispatchEventManager; + private EventManager rsListenerDispatchEventManager; public RegistrySharedObject() { // |