Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=149862 and for previously undiscovered bug in default handling of create response message

3 files changed, 21 insertions, 21 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
index 4a8cc50ac..021ba5a7a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
+++ b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
@@ -136,26 +136,6 @@
    </extension>
 
 
-   <extension
-         point="org.eclipse.ecf.containerFactory">
-      <containerFactory
-            class="org.eclipse.ecf.provider.generic.ContainerInstantiator"
-            description="Generic Server Container Instantiator"
-            name="ecf.generic.server">
-         <defaultargument
-               value="ecftcp://localhost:3282/server"
-               type="org.eclipse.ecf.core.identity.ID"
-               name="id"/>
-         <defaultargument
-               value="30000"
-               type="java.lang.Integer"
-               name="keepAlive"/>
-         <property
-               value="true"
-               name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.isServer"/>
-      </containerFactory>
-   </extension>
-
    <extension id="org.eclipse.ecf.example.collab.sharedmarker" point="org.eclipse.core.resources.markers" name="ECF Marker">
 	   <persistent value="true"/>
        <super type="org.eclipse.core.resources.problemmarker"/>
diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.xml b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
index dd83fb815..d8dd0b12e 100644
--- a/framework/bundles/org.eclipse.ecf.provider/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
@@ -13,4 +13,24 @@
                name="keepAlive"/>
       </connectionFactory>
    </extension>
+   <extension
+         point="org.eclipse.ecf.containerFactory">
+      <containerFactory
+            class="org.eclipse.ecf.provider.generic.ContainerInstantiator"
+            description="Generic Server Container Instantiator"
+            name="ecf.generic.server">
+         <defaultargument
+               value="ecftcp://localhost:3282/server"
+               type="org.eclipse.ecf.core.identity.ID"
+               name="id"/>
+         <defaultargument
+               value="30000"
+               type="java.lang.Integer"
+               name="keepAlive"/>
+         <property
+               value="true"
+               name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.isServer"/>
+      </containerFactory>
+   </extension>
+
 </plugin>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java
index a8e3ae83b..e248fb112 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java
@@ -291,7 +291,7 @@ public class AbstractSharedObject implements ISharedObject,
      */
     protected boolean handleSharedObjectCreateResponseEvent(ISharedObjectCreateResponseEvent createResponseEvent) {
     	trace("handleSharedObjectCreateResponseEvent("+createResponseEvent+")");
-    	return true;
+    	return false;
     }
     /**
      * SharedObjectMsg handler method.  This method will be called by {@link #handleSharedObjectMsgEvent(ISharedObjectMessageEvent)} when