1 files changed, 144 insertions, 144 deletions

diff --git a/cs/demo/IceGrid/allocate/Client.cs b/cs/demo/IceGrid/allocate/Client.cs
index 24cef92b254..7d3b8792e08 100644
--- a/cs/demo/IceGrid/allocate/Client.cs
+++ b/cs/demo/IceGrid/allocate/Client.cs
@@ -17,47 +17,47 @@ public class Client : Ice.Application
     class SessionKeepAliveThread 
     {
         public SessionKeepAliveThread(IceGrid.SessionPrx session, int timeout)
-	{
-	    _session = session;
-	    _timeout = timeout;
-	    _terminated = false;
-	}
-
-	public void run()
-	{
-	    lock(this)
-	    {
+        {
+            _session = session;
+            _timeout = timeout;
+            _terminated = false;
+        }
+
+        public void run()
+        {
+            lock(this)
+            {
                 while(!_terminated)
                 {
-	            System.Threading.Monitor.Wait(this, _timeout);
+                    System.Threading.Monitor.Wait(this, _timeout);
                     if(_terminated)
                     {
-		        break;
-		    }
+                        break;
+                    }
                     try
                     {
                         _session.keepAlive();
                     }
                     catch(Ice.LocalException)
                     {
-		        break;
+                        break;
                     }
                 }
-	    }
-	}
-
-	public void terminate()
-	{
-	    lock(this)
-	    {
-	        _terminated = true;
-	        System.Threading.Monitor.Pulse(this);
-	    }
-	}
-
-	private IceGrid.SessionPrx _session;
-	private int _timeout;
-	private bool _terminated;
+            }
+        }
+
+        public void terminate()
+        {
+            lock(this)
+            {
+                _terminated = true;
+                System.Threading.Monitor.Pulse(this);
+            }
+        }
+
+        private IceGrid.SessionPrx _session;
+        private int _timeout;
+        private bool _terminated;
     }
 
     private void menu()
@@ -72,129 +72,129 @@ public class Client : Ice.Application
 
     public override int run(string[] args)
     {
-	int status = 0;
+        int status = 0;
         IceGrid.RegistryPrx registry = 
-	    IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
-	if(registry == null)
-	{
+            IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
+        if(registry == null)
+        {
             Console.WriteLine("could not contact registry");
-	    return 1;
-	}
-
-	
-	IceGrid.SessionPrx session = null;
-	while(true)
-	{
-	    Console.Out.WriteLine("This demo accepts any user-id / password combination.");
-
-	    string id;
-	    Console.Out.Write("user id: ");
-	    Console.Out.Flush();
-	    id = Console.In.ReadLine();
-
-	    string pw;
-	    Console.Out.Write("password: ");
-	    Console.Out.Flush();
-	    pw = Console.In.ReadLine();
-
-	    try
-	    {
-	        session = registry.createSession(id, pw);
-		break;
-	    }
-	    catch(IceGrid.PermissionDeniedException ex)
-	    {
-	        Console.WriteLine("permission denied:\n" + ex.reason);
-	    }
-	}
-
-	SessionKeepAliveThread keepAlive = new SessionKeepAliveThread(session, (int)registry.getSessionTimeout() / 2);
-	Thread keepAliveThread = new Thread(new ThreadStart(keepAlive.run));
-	keepAliveThread.Start();
-
-	try
-	{
-	    HelloPrx hello;
-	    try
-	    {
-		hello = HelloPrxHelper.checkedCast(
-		    session.allocateObjectById(communicator().stringToIdentity("hello")));
-	    }
-	    catch(IceGrid.ObjectNotRegisteredException)
-	    {
-		hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"));
-	    }
-
-	    menu();
-
-	    string line = null;
-	    do
-	    {
-		try
-		{
-		    Console.Write("==> ");
-		    Console.Out.Flush();
-		    line = Console.In.ReadLine();
-		    if(line == null)
-		    {
-			break;
-		    }
-		    if(line.Equals("t"))
-		    {
-			hello.sayHello();
-		    }
-		    else if(line.Equals("s"))
-		    {
-			hello.shutdown();
-		    }
-		    else if(line.Equals("x"))
-		    {
-			// Nothing to do
-		    }
-		    else if(line.Equals("?"))
-		    {
-			menu();
-		    }
-		    else
-		    {
-			Console.WriteLine("unknown command `" + line + "'");
-			menu();
-		    }
-		}
-		catch(Ice.LocalException ex)
-		{
-		    Console.WriteLine(ex);
-		}
-	    }
-	    while(!line.Equals("x"));
-    	}
-	catch(IceGrid.AllocationException ex)
-	{
-	    Console.WriteLine("could not allocate object: " + ex.reason);
-	    status = 1;
-	}
-	catch(Exception ex)
-	{
-	    Console.WriteLine("expected exception: " + ex);
-	    status = 1;
-	}
-	
-	//
-	// Destroy the keepAlive thread and the sesion object otherwise
-	// the session will be kept allocated until the timeout occurs.
-	// Destroying the session will release all allocated objects.
-	//
-	keepAlive.terminate();
-	keepAliveThread.Join();
-	session.destroy();
+            return 1;
+        }
+
+        
+        IceGrid.SessionPrx session = null;
+        while(true)
+        {
+            Console.Out.WriteLine("This demo accepts any user-id / password combination.");
+
+            string id;
+            Console.Out.Write("user id: ");
+            Console.Out.Flush();
+            id = Console.In.ReadLine();
+
+            string pw;
+            Console.Out.Write("password: ");
+            Console.Out.Flush();
+            pw = Console.In.ReadLine();
+
+            try
+            {
+                session = registry.createSession(id, pw);
+                break;
+            }
+            catch(IceGrid.PermissionDeniedException ex)
+            {
+                Console.WriteLine("permission denied:\n" + ex.reason);
+            }
+        }
+
+        SessionKeepAliveThread keepAlive = new SessionKeepAliveThread(session, (int)registry.getSessionTimeout() / 2);
+        Thread keepAliveThread = new Thread(new ThreadStart(keepAlive.run));
+        keepAliveThread.Start();
+
+        try
+        {
+            HelloPrx hello;
+            try
+            {
+                hello = HelloPrxHelper.checkedCast(
+                    session.allocateObjectById(communicator().stringToIdentity("hello")));
+            }
+            catch(IceGrid.ObjectNotRegisteredException)
+            {
+                hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"));
+            }
+
+            menu();
+
+            string line = null;
+            do
+            {
+                try
+                {
+                    Console.Write("==> ");
+                    Console.Out.Flush();
+                    line = Console.In.ReadLine();
+                    if(line == null)
+                    {
+                        break;
+                    }
+                    if(line.Equals("t"))
+                    {
+                        hello.sayHello();
+                    }
+                    else if(line.Equals("s"))
+                    {
+                        hello.shutdown();
+                    }
+                    else if(line.Equals("x"))
+                    {
+                        // Nothing to do
+                    }
+                    else if(line.Equals("?"))
+                    {
+                        menu();
+                    }
+                    else
+                    {
+                        Console.WriteLine("unknown command `" + line + "'");
+                        menu();
+                    }
+                }
+                catch(Ice.LocalException ex)
+                {
+                    Console.WriteLine(ex);
+                }
+            }
+            while(!line.Equals("x"));
+        }
+        catch(IceGrid.AllocationException ex)
+        {
+            Console.WriteLine("could not allocate object: " + ex.reason);
+            status = 1;
+        }
+        catch(Exception ex)
+        {
+            Console.WriteLine("expected exception: " + ex);
+            status = 1;
+        }
+        
+        //
+        // Destroy the keepAlive thread and the sesion object otherwise
+        // the session will be kept allocated until the timeout occurs.
+        // Destroying the session will release all allocated objects.
+        //
+        keepAlive.terminate();
+        keepAliveThread.Join();
+        session.destroy();
 
         return status;
     }
 
     public static void Main(string[] args)
     {
-	Client app = new Client();
-	int status = app.main(args, "config.client");
+        Client app = new Client();
+        int status = app.main(args, "config.client");
         if(status != 0)
         {
             System.Environment.Exit(status);