| commit | cfeebf34add33543f0f551291c56efabf95b2cbf | [log] [tgz] |
|---|---|---|
| author | slewis <slewis> | Wed May 28 18:02:01 2008 +0000 |
| committer | slewis <slewis> | Wed May 28 18:02:01 2008 +0000 |
| tree | ebacfc2274becd8c3be9a89eccaaca35e6d2386b | |
| parent | ba40ead813f28c55dca40322f79d263703f4d4dd [diff] |
Made handling of ID.toExternalForm and Namespace.createInstance consistent for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=234449
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java index dbcc8a5..300dcd7 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiRemoteServiceContainer.java
@@ -328,7 +328,7 @@ */ public void connect(final ID targetID, final IConnectContext connectContext) throws ContainerConnectException { Assert.isNotNull(targetID); - Assert.isNotNull(connectContext); + //Assert.isNotNull(connectContext); if (containerID != null) { throw new ContainerConnectException("Container is already connected to " + containerID); //$NON-NLS-1$
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java index 972cb87..d958b3b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java
@@ -61,7 +61,7 @@ return null; if (args[0] instanceof String) { String arg = (String) args[0]; - if (arg.startsWith(getScheme() + Namespace.SCHEME_SEPARATOR)) { + if (arg.startsWith(this.getClass().getName() + Namespace.SCHEME_SEPARATOR)) { int index = arg.indexOf(Namespace.SCHEME_SEPARATOR); if (index >= arg.length()) return null; @@ -112,4 +112,10 @@ return new String[] {NAMESPACE_SCHEME}; } + /* (non-Javadoc) + * @see org.eclipse.ecf.core.identity.Namespace#toExternalForm(org.eclipse.ecf.core.identity.BaseID) + */ + protected String toExternalForm(BaseID id) { + return this.getClass().getName() + Namespace.SCHEME_SEPARATOR + id.toExternalForm(); + } } \ No newline at end of file