Fix for handling of server disconnect/failure (clean up, etc).

2 files changed, 3 insertions, 0 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
index 2e5fc677e..920952ba4 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
@@ -81,6 +81,7 @@ public class Client {
             return obj;
         }
         public void dispose() {
+            if (obj != null) obj.destroySelf();
             client.dispose(0);
         }
     }
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index 00495c521..edd7b93c0 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -384,10 +384,12 @@ public abstract class SOContainer implements ISharedObjectContainer {
 			sharedObjectManager.dispose();
 			sharedObjectManager = null;
 		}
+		/*
 		if (sharedObjectThreadGroup != null) {
 			sharedObjectThreadGroup.interrupt();
 			sharedObjectThreadGroup = null;
 		}
+		*/
 		if (loadingThreadGroup != null) {
 			loadingThreadGroup.interrupt();
 			loadingThreadGroup = null;