More catch-up with 1.4.0 changes.

1 files changed, 75 insertions, 69 deletions

diff --git a/cs/src/Ice/ObjectFactoryManager.cs b/cs/src/Ice/ObjectFactoryManager.cs
index b565e9557a6..08cc052ce6f 100755
--- a/cs/src/Ice/ObjectFactoryManager.cs
+++ b/cs/src/Ice/ObjectFactoryManager.cs
@@ -7,72 +7,78 @@
 //
 // **********************************************************************
 
-

-namespace IceInternal

-{

-

-    using System.Collections;

-

-    public sealed class ObjectFactoryManager

-    {

-	public void add(Ice.ObjectFactory factory, string id)

-	{

-	    lock(this)

-	    {

-		object o = _factoryMap[id];

-		if(o != null)

-		{

-		    Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();

-		    ex.id = id;

-		    ex.kindOfObject = "user exception factory";

-		    throw ex;

-		}

-		_factoryMap[id] = factory;

-	    }

-	}

-	

-	public void remove(string id)

-	{

-	    lock(this)

-	    {

-		object o = _factoryMap[id];

-		if(o == null)

-		{

-		    Ice.NotRegisteredException ex = new Ice.NotRegisteredException();

-		    ex.id = id;

-		    ex.kindOfObject = "user exception factory";

-		    throw ex;

-		}

-		_factoryMap.Remove(id);

-	    }

-	}

-	

-	public Ice.ObjectFactory find(string id)

-	{

-	    lock(this)

-	    {

-		return (Ice.ObjectFactory)_factoryMap[id];

-	    }

-	}

-	

-	//

-	// Only for use by Instance

-	//

-	internal ObjectFactoryManager()

-	{

-	    _factoryMap = new Hashtable();

-	}

-	

-	internal void destroy()

-	{

-	    foreach(Ice.ObjectFactory factory in _factoryMap.Values)

-	    {

-		factory.destroy();

-	    }

-	    _factoryMap.Clear();

-	}

-	

-	private Hashtable _factoryMap;

-    }

-

-}

+
+namespace IceInternal
+{
+
+    using System.Collections;
+
+    public sealed class ObjectFactoryManager
+    {
+	public void add(Ice.ObjectFactory factory, string id)
+	{
+	    lock(this)
+	    {
+		object o = _factoryMap[id];
+		if(o != null)
+		{
+		    Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
+		    ex.id = id;
+		    ex.kindOfObject = "object factory";
+		    throw ex;
+		}
+		_factoryMap[id] = factory;
+	    }
+	}
+	
+	public void remove(string id)
+	{
+	    lock(this)
+	    {
+		object o = _factoryMap[id];
+		if(o == null)
+		{
+		    Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
+		    ex.id = id;
+		    ex.kindOfObject = "object factory";
+		    throw ex;
+		}
+
+		((Ice.ObjectFactory)o).destroy();
+
+		_factoryMap.Remove(id);
+	    }
+	}
+	
+	public Ice.ObjectFactory find(string id)
+	{
+	    lock(this)
+	    {
+		return (Ice.ObjectFactory)_factoryMap[id];
+	    }
+	}
+	
+	//
+	// Only for use by Instance
+	//
+	internal ObjectFactoryManager()
+	{
+	    _factoryMap = new Hashtable();
+	}
+	
+	internal void destroy()
+	{
+	    lock(this)
+	    {
+		foreach(Ice.ObjectFactory factory in _factoryMap.Values)
+		{
+		    factory.destroy();
+		}
+		_factoryMap.Clear();
+	    }
+	}
+	
+	private Hashtable _factoryMap;
+    }
+
+}