Small fixes

2 files changed, 9 insertions, 9 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
index 141dd6a69..3c78243d0 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
@@ -48,10 +48,12 @@ public class SOConfig implements ISharedObjectConfig {
         }
     }
 
-    protected void makeInactive() {
-        this.context.makeInactive();
-        this.context = null;
-        isActive = false;
+    protected synchronized void makeInactive() {
+        if (isActive) {
+            this.context.makeInactive();
+            this.context = null;
+            isActive = false;
+        }
     }
 
     /*
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 0e1b9147a..6ffeb3c15 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
@@ -103,10 +103,8 @@ public abstract class SOContainer implements ISharedObjectContainer {
 						// list.
 						SOWrapper wrap = makeNewRemoteSharedObjectWrapper(
 								fromID, description, obj);
-						// Get config info for new object
-						SOConfig aConfig = wrap.getConfig();
-						// Call init method on new object.
-						obj.init(aConfig);
+                        
+                        wrap.init();
 						// Check to make sure thread has not been
 						// interrupted...if it has, throw
 						if (Thread.currentThread().isInterrupted()
@@ -702,7 +700,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 			if (sow != null) {
 				sow.deliverCreateResponse(fromID, resp);
 			} else {
-				log("handleCreateResponseMessage...wrapper now found for "
+				log("handleCreateResponseMessage...wrapper not found for "
 						+ sharedObjectID);
 			}
 		} else {