Enhanced generic container instantiator

1 files changed, 13 insertions, 4 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
index 6759a236e..b39ab30c6 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java
@@ -3,6 +3,7 @@ package org.eclipse.ecf.provider.generic;
 import org.eclipse.ecf.core.ISharedObjectContainer;
 import org.eclipse.ecf.core.SharedObjectContainerInstantiationException;
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator;
 
 public class ContainerInstantiator implements ISharedObjectContainerInstantiator {
@@ -14,10 +15,18 @@ public class ContainerInstantiator implements ISharedObjectContainerInstantiator
     public ISharedObjectContainer makeInstance(Class[] argTypes, Object[] args)
             throws SharedObjectContainerInstantiationException {
         try {
-            Boolean isClient = null;
+            Boolean isClient = new Boolean(true);
             ID id = null;
-            isClient = (Boolean) args[0];
-            id = (ID) args[1];
+            if (args != null) {
+	            if (args.length == 2) {
+	            	isClient = (Boolean) args[0];
+	            	id = (ID) args[1];
+	            } else if (args.length == 1) {
+	            	id = (ID) args[0];
+	            }
+            } else {
+            	id = IDFactory.makeGUID();
+            }
             ISharedObjectContainer result = null;
             if (isClient.booleanValue()) {
                 return new TCPClientSOContainer(new SOContainerConfig(id));
@@ -25,7 +34,7 @@ public class ContainerInstantiator implements ISharedObjectContainerInstantiator
                 return new TCPServerSOContainer(new SOContainerConfig(id));
             }
         } catch (Exception e) {
-            throw new SharedObjectContainerInstantiationException("Exception creating container",e);
+            throw new SharedObjectContainerInstantiationException("Exception creating generic container",e);
         }
     }