Made handling of ID.toExternalForm and Namespace.createInstance consistent for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=234449v20080528-1408

2 files changed, 8 insertions, 2 deletions

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 dbcc8a597..300dcd7e8 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 @@ final class R_OSGiRemoteServiceContainer implements IRemoteServiceContainerAdapt
 	 */
 	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 972cb871b..d958b3b38 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 @@ public class R_OSGiNamespace extends Namespace {
 			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 @@ public class R_OSGiNamespace extends Namespace {
 		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