2 files changed, 335 insertions, 337 deletions
diff --git a/cs/src/Ice/Application.cs b/cs/src/Ice/Application.cs
index c9b405862b3..fe6b96eb0d6 100755
--- a/cs/src/Ice/Application.cs
+++ b/cs/src/Ice/Application.cs
@@ -20,8 +20,7 @@ namespace Ice
     {
 	public abstract int run(string[] args);
 
-	public
-	Application()
+	public Application()
 	{
 	    bool rc;
 	    rc = SetConsoleCtrlHandler(_handler, true); 
@@ -320,5 +319,4 @@ namespace Ice
 	private static volatile string _appName = AppDomain.CurrentDomain.FriendlyName;
 	private static Communicator _communicator;
     }
-
 }
diff --git a/cs/src/Ice/CommunicatorI.cs b/cs/src/Ice/CommunicatorI.cs
index 028b6a910fc..dce99d753d0 100755
--- a/cs/src/Ice/CommunicatorI.cs
+++ b/cs/src/Ice/CommunicatorI.cs
@@ -7,337 +7,337 @@
 //
 // **********************************************************************
 
-namespace Ice
-{
-	
-    sealed class CommunicatorI : LocalObjectImpl, Communicator
-    {
-	public void destroy()
-	{
-	    IceInternal.Instance instance = null;
-	    
-	    lock(this)
-	    {
-		if(!_destroyed) // Don't destroy twice.
-		{
-		    _destroyed = true;
-		    _serverThreadPool = null;
-		    instance = _instance;
-		}
-	    }
-	    
-	    if(instance != null)
-	    {
-		instance.destroy();
-	    }
-	}
-
-	public void shutdown()
-	{
-	    IceInternal.ObjectAdapterFactory objectAdapterFactory;
-	    
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		objectAdapterFactory = _instance.objectAdapterFactory();
-	    }
-	    
-	    //
-	    // We must call shutdown on the object adapter factory
-	    // outside the synchronization, otherwise the communicator is
-	    // blocked while we wait for shutdown.
-	    //
-	    objectAdapterFactory.shutdown();
-	}
-	
-	public void waitForShutdown()
-	{
-	    IceInternal.ObjectAdapterFactory objectAdapterFactory;
-	    
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		objectAdapterFactory = _instance.objectAdapterFactory();
-	    }
-	    
-	    //
-	    // We must call waitForShutdown on the object adapter factory
-	    // outside the synchronization, otherwise the communicator is
-	    // blocked while we wait for shutdown.
-	    //
-	    objectAdapterFactory.waitForShutdown();
-	}
-	
-	public Ice.ObjectPrx stringToProxy(string s)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		return _instance.proxyFactory().stringToProxy(s);
-	    }
-	}
-	
-	public string proxyToString(Ice.ObjectPrx proxy)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		return _instance.proxyFactory().proxyToString(proxy);
-	    }
-	}
-
-	public ObjectAdapter createObjectAdapter(string name)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		
-		ObjectAdapter adapter = _instance.objectAdapterFactory().createObjectAdapter(name);
-		
-		if(_serverThreadPool == null) // Lazy initialization of _serverThreadPool.
-		{
-		    _serverThreadPool = _instance.serverThreadPool();
-		}
-		
-		return adapter;
-	    }
-	}
-	
-	public ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints)
-	{
-	    lock(this)
-	    {
-		getProperties().setProperty(name + ".Endpoints", endpoints);
-		return createObjectAdapter(name);
-	    }
-	}
-	
-	public void addObjectFactory(ObjectFactory factory, string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.servantFactoryManager().add(factory, id);
-	    }
-	}
-	
-	public void removeObjectFactory(string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.servantFactoryManager().remove(id);
-	    }
-	}
-	
-	public ObjectFactory findObjectFactory(string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		return _instance.servantFactoryManager().find(id);
-	    }
-	}
-	
-	public void addUserExceptionFactory(IceInternal.UserExceptionFactory factory, string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.userExceptionFactoryManager().add(factory, id);
-	    }
-	}
-	
-	public void removeUserExceptionFactory(string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.userExceptionFactoryManager().remove(id);
-	    }
-	}
-	
-	public IceInternal.UserExceptionFactory findUserExceptionFactory(string id)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		return _instance.userExceptionFactoryManager().find(id);
-	    }
-	}
-	
-	public Properties getProperties()
-	{
-	    lock(this)
-	    {
-		//
-		// No check for destruction. It must be possible to access the
-		// properties after destruction.
-		//
-		return _instance.properties();
-	    }
-	}
-
-	
-	public Logger getLogger()
-	{
-	    lock(this)
-	    {
-		//
-		// No check for destruction. It must be possible to access the
-		// logger after destruction.
-		//
-		return _instance.logger();
-	    }
-	}
-
-	public void setLogger(Logger logger)
-	{
-	    lock(this)
-	    {
-		//
-		// No check for destruction. It must be possible to set the
-		// logger after destruction (needed by logger plugins for
-		// example to unset the logger).
-		//
-		_instance.logger(logger);
-	    }
-	}
-	    
-	public Stats getStats()
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-			throw new CommunicatorDestroyedException();
-		}
-		return _instance.stats();
-	    }
-	}
-
-	public void setStats(Stats stats)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.stats(stats);
-	    }
-	}
-
-	public void setDefaultRouter(RouterPrx router)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.referenceFactory().setDefaultRouter(router);
-	    }
-	}
-
-	public void setDefaultLocator(LocatorPrx locator)
-	{
-	    lock(this)
-	    {
-		if(_destroyed)
-		{
-		    throw new CommunicatorDestroyedException();
-		}
-		_instance.referenceFactory().setDefaultLocator(locator);
-	    }
-	}
-
-	public PluginManager getPluginManager()
-	{
-	    return null;
-	}
-
-	public void flushBatchRequests()
-	{
-	    _instance.flushBatchRequests();
-	}
-	
-	internal CommunicatorI(Properties properties)
-	{
-	    _destroyed = false;
-	    _instance = new IceInternal.Instance(this, properties);
-	}
-	
-	~CommunicatorI()
-	{
-	    if(!_destroyed)
-	    {
-		_instance.logger().warning("Ice::Communicator::destroy() has not been called");
-	    }
-	}
-
-	//
-	// Certain initialization tasks need to be completed after the
-	// constructor.
-	//
-	internal void finishSetup(ref string[] args)
-	{
-	    _instance.finishSetup(ref args);
-	}
-	
-	//
-	// For use by Util.getInstance()
-	//
-	internal IceInternal.Instance getInstance()
-	{
-	    return _instance;
-	}
-	
-	
-	private bool _destroyed;
-	private IceInternal.Instance _instance;
-	
-	//
-	// We need _serverThreadPool directly in CommunicatorI. That's
-	// because the shutdown() operation is signal-safe, and thus must
-	// not access any mutex locks or _instance. It may only access
-	// _serverThreadPool.initiateShutdown(), which is signal-safe as
-	// well.
-	//
-	private IceInternal.ThreadPool _serverThreadPool;
-    }
-
-}
+namespace Ice
+{
+	
+    sealed class CommunicatorI : LocalObjectImpl, Communicator
+    {
+	public void destroy()
+	{
+	    IceInternal.Instance instance = null;
+	    
+	    lock(this)
+	    {
+		if(!_destroyed) // Don't destroy twice.
+		{
+		    _destroyed = true;
+		    _serverThreadPool = null;
+		    instance = _instance;
+		}
+	    }
+	    
+	    if(instance != null)
+	    {
+		instance.destroy();
+	    }
+	}
+
+	public void shutdown()
+	{
+	    IceInternal.ObjectAdapterFactory objectAdapterFactory;
+	    
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		objectAdapterFactory = _instance.objectAdapterFactory();
+	    }
+	    
+	    //
+	    // We must call shutdown on the object adapter factory
+	    // outside the synchronization, otherwise the communicator is
+	    // blocked while we wait for shutdown.
+	    //
+	    objectAdapterFactory.shutdown();
+	}
+	
+	public void waitForShutdown()
+	{
+	    IceInternal.ObjectAdapterFactory objectAdapterFactory;
+	    
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		objectAdapterFactory = _instance.objectAdapterFactory();
+	    }
+	    
+	    //
+	    // We must call waitForShutdown on the object adapter factory
+	    // outside the synchronization, otherwise the communicator is
+	    // blocked while we wait for shutdown.
+	    //
+	    objectAdapterFactory.waitForShutdown();
+	}
+	
+	public Ice.ObjectPrx stringToProxy(string s)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		return _instance.proxyFactory().stringToProxy(s);
+	    }
+	}
+	
+	public string proxyToString(Ice.ObjectPrx proxy)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		return _instance.proxyFactory().proxyToString(proxy);
+	    }
+	}
+
+	public ObjectAdapter createObjectAdapter(string name)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		
+		ObjectAdapter adapter = _instance.objectAdapterFactory().createObjectAdapter(name);
+		
+		if(_serverThreadPool == null) // Lazy initialization of _serverThreadPool.
+		{
+		    _serverThreadPool = _instance.serverThreadPool();
+		}
+		
+		return adapter;
+	    }
+	}
+	
+	public ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints)
+	{
+	    lock(this)
+	    {
+		getProperties().setProperty(name + ".Endpoints", endpoints);
+		return createObjectAdapter(name);
+	    }
+	}
+	
+	public void addObjectFactory(ObjectFactory factory, string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.servantFactoryManager().add(factory, id);
+	    }
+	}
+	
+	public void removeObjectFactory(string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.servantFactoryManager().remove(id);
+	    }
+	}
+	
+	public ObjectFactory findObjectFactory(string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		return _instance.servantFactoryManager().find(id);
+	    }
+	}
+	
+	public void addUserExceptionFactory(IceInternal.UserExceptionFactory factory, string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.userExceptionFactoryManager().add(factory, id);
+	    }
+	}
+	
+	public void removeUserExceptionFactory(string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.userExceptionFactoryManager().remove(id);
+	    }
+	}
+	
+	public IceInternal.UserExceptionFactory findUserExceptionFactory(string id)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		return _instance.userExceptionFactoryManager().find(id);
+	    }
+	}
+	
+	public Properties getProperties()
+	{
+	    lock(this)
+	    {
+		//
+		// No check for destruction. It must be possible to access the
+		// properties after destruction.
+		//
+		return _instance.properties();
+	    }
+	}
+
+	
+	public Logger getLogger()
+	{
+	    lock(this)
+	    {
+		//
+		// No check for destruction. It must be possible to access the
+		// logger after destruction.
+		//
+		return _instance.logger();
+	    }
+	}
+
+	public void setLogger(Logger logger)
+	{
+	    lock(this)
+	    {
+		//
+		// No check for destruction. It must be possible to set the
+		// logger after destruction (needed by logger plugins for
+		// example to unset the logger).
+		//
+		_instance.logger(logger);
+	    }
+	}
+	    
+	public Stats getStats()
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+			throw new CommunicatorDestroyedException();
+		}
+		return _instance.stats();
+	    }
+	}
+
+	public void setStats(Stats stats)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.stats(stats);
+	    }
+	}
+
+	public void setDefaultRouter(RouterPrx router)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.referenceFactory().setDefaultRouter(router);
+	    }
+	}
+
+	public void setDefaultLocator(LocatorPrx locator)
+	{
+	    lock(this)
+	    {
+		if(_destroyed)
+		{
+		    throw new CommunicatorDestroyedException();
+		}
+		_instance.referenceFactory().setDefaultLocator(locator);
+	    }
+	}
+
+	public PluginManager getPluginManager()
+	{
+	    return null;
+	}
+
+	public void flushBatchRequests()
+	{
+	    _instance.flushBatchRequests();
+	}
+	
+	internal CommunicatorI(Properties properties)
+	{
+	    _destroyed = false;
+	    _instance = new IceInternal.Instance(this, properties);
+	}
+	
+	~CommunicatorI()
+	{
+	    if(!_destroyed)
+	    {
+		_instance.logger().warning("Ice::Communicator::destroy() has not been called");
+	    }
+	}
+
+	//
+	// Certain initialization tasks need to be completed after the
+	// constructor.
+	//
+	internal void finishSetup(ref string[] args)
+	{
+	    _instance.finishSetup(ref args);
+	}
+	
+	//
+	// For use by Util.getInstance()
+	//
+	internal IceInternal.Instance getInstance()
+	{
+	    return _instance;
+	}
+	
+	
+	private bool _destroyed;
+	private IceInternal.Instance _instance;
+	
+	//
+	// We need _serverThreadPool directly in CommunicatorI. That's
+	// because the shutdown() operation is signal-safe, and thus must
+	// not access any mutex locks or _instance. It may only access
+	// _serverThreadPool.initiateShutdown(), which is signal-safe as
+	// well.
+	//
+	private IceInternal.ThreadPool _serverThreadPool;
+    }
+
+}