Bug fix for joinGroup for org.eclipse.ecf.provider generic container. New test case for testing Container Join.

2 files changed, 6 insertions, 6 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
index b892be6ff..125a6ae2a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
@@ -56,16 +56,16 @@ public abstract class ClientSOContainer extends SOContainer {
     public ID getGroupID() {
         return remoteServerID;
     }
-    public void joinGroup(ID remoteSpace, Object data)
+    public void joinGroup(ID remote, Object data)
             throws SharedObjectContainerJoinException {
         try {
             if (isClosing)
                 throw new IllegalStateException("container is closing");
             ISynchAsynchConnection aConnection = getClientConnection(
-                    remoteSpace, data);
+            		remote, data);
             if (aConnection == null) {
                 ConnectException c = new ConnectException("join failed to"
-                        + ":" + remoteSpace.getName());
+                        + ":" + remote.getName());
                 throw c;
             }
             ContainerMessage response;
@@ -89,9 +89,9 @@ public abstract class ClientSOContainer extends SOContainer {
             }
             synchronized (aConnection) {
                 try {
-                    Object connectData = getConnectData(remoteSpace, data);
+                    Object connectData = getConnectData(remote, data);
                     response = (ContainerMessage) aConnection.connect(
-                            remoteSpace, connectData, 0);
+                    		remote, connectData, 0);
                 } catch (IOException e) {
                     synchronized (connectLock) {
                         killConnection(aConnection);
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
index 597cdb0ae..2acc08558 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
@@ -10,7 +10,7 @@ import org.eclipse.ecf.core.identity.IDFactory;
 public class TCPClientSOContainer extends ClientSOContainer {
     int keepAlive = 0;
 
-    public static final String DEFAULT_COMM_NAME = "tcpclient";
+    public static final String DEFAULT_COMM_NAME = org.eclipse.ecf.provider.comm.tcp.Client.class.getName();
     
     public TCPClientSOContainer(ISharedObjectContainerConfig config) {
         super(config);