Turned Ice.Current and Ice.Identity into structures. Some code tidy up as

    well.

1 files changed, 173 insertions, 185 deletions

diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index 74a0cb23d14..5a7cfc17237 100755
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -7,188 +7,176 @@
 //
 // **********************************************************************
 
-namespace IceInternal

-{

-

-    using System.Collections;

-    using System.Diagnostics;

-    using IceUtil;

-

-    public sealed class ObjectAdapterFactory

-    {

-	public void shutdown()

-	{

-	    lock(this)

-	    {

-		//

-		// Ignore shutdown requests if the object adapter factory has

-		// already been shut down.

-		//

-		if(_instance == null)

-		{

-		    return;

-		}

-		

-		foreach(Ice.ObjectAdapter adapter in _adapters.Values)

-		{

-		    adapter.deactivate();

-		}

-		

-		_instance = null;

-		_communicator = null;

-		

-		System.Threading.Monitor.PulseAll(this);

-	    }

-	}

-	

-	public void waitForShutdown()

-	{

-	    lock(this)

-	    {

-		//

-		// First we wait for the shutdown of the factory itself.

-		//

-		while(_instance != null)

-		{

-		    try

-		    {

-			System.Threading.Monitor.Wait(this);

-		    }

-		    catch(System.Threading.ThreadInterruptedException)

-		    {

-		    }

-		}

-		

-		//

-		// If some other thread is currently shutting down, we wait

-		// until this thread is finished.

-		//

-		while(_waitForShutdown)

-		{

-		    try

-		    {

-			System.Threading.Monitor.Wait(this);

-		    }

-		    catch(System.Threading.ThreadInterruptedException)

-		    {

-		    }

-		}

-		_waitForShutdown = true;

-	    }

-	    

-	    //

-	    // Now we wait for deactivation of each object adapter.

-	    //

-	    foreach(Ice.ObjectAdapter adapter in _adapters.Values)

-	    {

-		adapter.waitForDeactivate();

-	    }

-	    

-	    //

-	    // We're done, now we can throw away the object adapters.

-	    //

-	    _adapters.Clear();

-	    

-	    lock(this)

-	    {

-		//

-		// Signal that waiting is complete.

-		//

-		_waitForShutdown = false;

-		System.Threading.Monitor.PulseAll(this);

-	    }

-	}

-	

-	public Ice.ObjectAdapter createObjectAdapter(string name)

-	{

-	    lock(this)

-	    {

-		if(_instance == null)

-		{

-		    throw new Ice.ObjectAdapterDeactivatedException();

-		}

-		

-		Ice.ObjectAdapter adapter = (Ice.ObjectAdapter)_adapters[name];

-		if(adapter != null)

-		{

-		    return adapter;

-		}

-		

-		adapter = new Ice.ObjectAdapterI(_instance, _communicator, name);

-		_adapters[name] = adapter;

-		return adapter;

-	    }

-	}

-	

-	public Ice.ObjectAdapter findObjectAdapter(Ice.ObjectPrx proxy)

-	{

-	    lock(this)

-	    {

-		if(_instance == null)

-		{

-		    return null;

-		}

-		

-		IEnumerator i = _adapters.Values.GetEnumerator();

-		while(i.MoveNext())

-		{

-		    Ice.ObjectAdapterI adapter = (Ice.ObjectAdapterI)i.Current;

-		    try

-		    {

-			if(adapter.isLocal(proxy))

-			{

-			    return adapter;

-			}

-		    }

-		    catch(Ice.ObjectAdapterDeactivatedException)

-		    {

-			// Ignore.

-		    }

-		}

-		

-		return null;

-	    }

-	}

-	

-	public void flushBatchRequests()

-	{

-	    LinkedList a = new LinkedList();

-	    lock(this)

-	    {

-		foreach(Ice.ObjectAdapterI adapter in _adapters.Values)

-		{

-		    a.Add(adapter);

-		}

-	    }

-	    foreach(Ice.ObjectAdapterI adapter in a)

-	    {

-		adapter.flushBatchRequests();

-	    }

-	}

-	

-	//

-	// Only for use by Instance.

-	//

-	internal ObjectAdapterFactory(Instance instance, Ice.Communicator communicator)

-	{

-	    _instance = instance;

-	    _communicator = communicator;

-	    _adapters = new Hashtable();

-	    _waitForShutdown = false;

-	}

-	

-	~ObjectAdapterFactory()

-	{

-	    Debug.Assert(_instance == null);

-	    Debug.Assert(_communicator == null);

-	    Debug.Assert(_adapters.Count == 0);

-	    Debug.Assert(!_waitForShutdown);

-	}

-	

-	private Instance _instance;

-	private Ice.Communicator _communicator;

-	private Hashtable _adapters;

-	private bool _waitForShutdown;

-    }

-

-}

+namespace IceInternal
+{
+
+    using System.Collections;
+    using System.Diagnostics;
+    using IceUtil;
+
+    public sealed class ObjectAdapterFactory
+    {
+	public void shutdown()
+	{
+	    lock(this)
+	    {
+		//
+		// Ignore shutdown requests if the object adapter factory has
+		// already been shut down.
+		//
+		if(_instance == null)
+		{
+		    return;
+		}
+		
+		foreach(Ice.ObjectAdapter adapter in _adapters.Values)
+		{
+		    adapter.deactivate();
+		}
+		
+		_instance = null;
+		_communicator = null;
+		
+		System.Threading.Monitor.PulseAll(this);
+	    }
+	}
+	
+	public void waitForShutdown()
+	{
+	    lock(this)
+	    {
+		//
+		// First we wait for the shutdown of the factory itself.
+		//
+		while(_instance != null)
+		{
+		    System.Threading.Monitor.Wait(this);
+		}
+		
+		//
+		// If some other thread is currently shutting down, we wait
+		// until this thread is finished.
+		//
+		while(_waitForShutdown)
+		{
+		    System.Threading.Monitor.Wait(this);
+		}
+		_waitForShutdown = true;
+	    }
+	    
+	    //
+	    // Now we wait for deactivation of each object adapter.
+	    //
+	    foreach(Ice.ObjectAdapter adapter in _adapters.Values)
+	    {
+		adapter.waitForDeactivate();
+	    }
+	    
+	    //
+	    // We're done, now we can throw away the object adapters.
+	    //
+	    _adapters.Clear();
+	    
+	    lock(this)
+	    {
+		//
+		// Signal that waiting is complete.
+		//
+		_waitForShutdown = false;
+		System.Threading.Monitor.PulseAll(this);
+	    }
+	}
+	
+	public Ice.ObjectAdapter createObjectAdapter(string name)
+	{
+	    lock(this)
+	    {
+		if(_instance == null)
+		{
+		    throw new Ice.ObjectAdapterDeactivatedException();
+		}
+		
+		Ice.ObjectAdapter adapter = (Ice.ObjectAdapter)_adapters[name];
+		if(adapter != null)
+		{
+		    return adapter;
+		}
+		
+		adapter = new Ice.ObjectAdapterI(_instance, _communicator, name);
+		_adapters[name] = adapter;
+		return adapter;
+	    }
+	}
+	
+	public Ice.ObjectAdapter findObjectAdapter(Ice.ObjectPrx proxy)
+	{
+	    lock(this)
+	    {
+		if(_instance == null)
+		{
+		    return null;
+		}
+		
+		IEnumerator i = _adapters.Values.GetEnumerator();
+		while(i.MoveNext())
+		{
+		    Ice.ObjectAdapterI adapter = (Ice.ObjectAdapterI)i.Current;
+		    try
+		    {
+			if(adapter.isLocal(proxy))
+			{
+			    return adapter;
+			}
+		    }
+		    catch(Ice.ObjectAdapterDeactivatedException)
+		    {
+			// Ignore.
+		    }
+		}
+		
+		return null;
+	    }
+	}
+	
+	public void flushBatchRequests()
+	{
+	    LinkedList a = new LinkedList();
+	    lock(this)
+	    {
+		foreach(Ice.ObjectAdapterI adapter in _adapters.Values)
+		{
+		    a.Add(adapter);
+		}
+	    }
+	    foreach(Ice.ObjectAdapterI adapter in a)
+	    {
+		adapter.flushBatchRequests();
+	    }
+	}
+	
+	//
+	// Only for use by Instance.
+	//
+	internal ObjectAdapterFactory(Instance instance, Ice.Communicator communicator)
+	{
+	    _instance = instance;
+	    _communicator = communicator;
+	    _adapters = new Hashtable();
+	    _waitForShutdown = false;
+	}
+	
+	~ObjectAdapterFactory()
+	{
+	    Debug.Assert(_instance == null);
+	    Debug.Assert(_communicator == null);
+	    Debug.Assert(_adapters.Count == 0);
+	    Debug.Assert(!_waitForShutdown);
+	}
+	
+	private Instance _instance;
+	private Ice.Communicator _communicator;
+	private Hashtable _adapters;
+	private bool _waitForShutdown;
+    }
+
+}