Expanded tabs into spaces

1 files changed, 196 insertions, 196 deletions

diff --git a/cs/src/Ice/ProxyFactory.cs b/cs/src/Ice/ProxyFactory.cs
index c213347902b..63c49fbe880 100755
--- a/cs/src/Ice/ProxyFactory.cs
+++ b/cs/src/Ice/ProxyFactory.cs
@@ -14,119 +14,119 @@ namespace IceInternal
 
     public sealed class ProxyFactory
     {
-	public Ice.ObjectPrx stringToProxy(string str)
-	{
-	    Reference r = instance_.referenceFactory().create(str);
-	    return referenceToProxy(r);
-	}
-	
-	public string proxyToString(Ice.ObjectPrx proxy)
-	{
-	    if(proxy != null)
-	    {
-		Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase) proxy;
-		return h.reference__().ToString();
-	    }
-	    else
-	    {
-		return "";
-	    }
-	}
-	
-	public Ice.ObjectPrx propertyToProxy(string prefix)
-	{
-	    Reference r = instance_.referenceFactory().createFromProperties(prefix);
-	    return referenceToProxy(r);
-	}
-	
-	public Ice.ObjectPrx streamToProxy(BasicStream s)
-	{
-	    Ice.Identity ident = new Ice.Identity();
-	    ident.read__(s);
-	    
-	    Reference r = instance_.referenceFactory().create(ident, s);
-	    return referenceToProxy(r);
-	}
-	
-	public Ice.ObjectPrx referenceToProxy(Reference r)
-	{
-	    if(r != null)
-	    {
-		Ice.ObjectPrxHelperBase proxy = new Ice.ObjectPrxHelperBase();
-		proxy.setup(r);
-		return proxy;
-	    }
-	    else
-	    {
-		return null;
-	    }
-	}
-	
-	public void proxyToStream(Ice.ObjectPrx proxy, BasicStream s)
-	{
-	    if(proxy != null)
-	    {
-		Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)proxy;
-		Reference r = h.reference__();
-		r.getIdentity().write__(s);
-		r.streamWrite(s);
-	    }
-	    else
-	    {
-		Ice.Identity ident = new Ice.Identity();
-		ident.name = "";
-		ident.category = "";
-		ident.write__(s);
-	    }
-	}
-	
-	public int checkRetryAfterException(Ice.LocalException ex, Reference @ref, int cnt)
-	{
-	    TraceLevels traceLevels = instance_.traceLevels();
-	    Ice.Logger logger = instance_.initializationData().logger;
+        public Ice.ObjectPrx stringToProxy(string str)
+        {
+            Reference r = instance_.referenceFactory().create(str);
+            return referenceToProxy(r);
+        }
+        
+        public string proxyToString(Ice.ObjectPrx proxy)
+        {
+            if(proxy != null)
+            {
+                Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase) proxy;
+                return h.reference__().ToString();
+            }
+            else
+            {
+                return "";
+            }
+        }
+        
+        public Ice.ObjectPrx propertyToProxy(string prefix)
+        {
+            Reference r = instance_.referenceFactory().createFromProperties(prefix);
+            return referenceToProxy(r);
+        }
+        
+        public Ice.ObjectPrx streamToProxy(BasicStream s)
+        {
+            Ice.Identity ident = new Ice.Identity();
+            ident.read__(s);
+            
+            Reference r = instance_.referenceFactory().create(ident, s);
+            return referenceToProxy(r);
+        }
+        
+        public Ice.ObjectPrx referenceToProxy(Reference r)
+        {
+            if(r != null)
+            {
+                Ice.ObjectPrxHelperBase proxy = new Ice.ObjectPrxHelperBase();
+                proxy.setup(r);
+                return proxy;
+            }
+            else
+            {
+                return null;
+            }
+        }
+        
+        public void proxyToStream(Ice.ObjectPrx proxy, BasicStream s)
+        {
+            if(proxy != null)
+            {
+                Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)proxy;
+                Reference r = h.reference__();
+                r.getIdentity().write__(s);
+                r.streamWrite(s);
+            }
+            else
+            {
+                Ice.Identity ident = new Ice.Identity();
+                ident.name = "";
+                ident.category = "";
+                ident.write__(s);
+            }
+        }
+        
+        public int checkRetryAfterException(Ice.LocalException ex, Reference @ref, int cnt)
+        {
+            TraceLevels traceLevels = instance_.traceLevels();
+            Ice.Logger logger = instance_.initializationData().logger;
 
-	    if(ex is Ice.ObjectNotExistException)
-	    {
-	        Ice.ObjectNotExistException one = (Ice.ObjectNotExistException)ex;
+            if(ex is Ice.ObjectNotExistException)
+            {
+                Ice.ObjectNotExistException one = (Ice.ObjectNotExistException)ex;
 
-		LocatorInfo li = @ref.getLocatorInfo();
-		if(li != null)
-		{
-		    //
-		    // We retry ObjectNotExistException if the reference is
-		    // indirect.
-		    //
-		    li.clearObjectCache((IndirectReference)@ref);
-		}
-		else if(@ref.getRouterInfo() != null && one.operation.Equals("ice_add_proxy"))
-		{
-		    //
-		    // If we have a router, an ObjectNotExistException with an
-		    // operation name "ice_add_proxy" indicates to the client
-		    // that the router isn't aware of the proxy (for example,
-		    // because it was evicted by the router). In this case, we
-		    // must *always* retry, so that the missing proxy is added
-		    // to the router.
-		    //
-		    if(traceLevels.retry >= 1)
-		    {
-		        string s = "retrying operation call to add proxy to router\n" + ex;
-			logger.trace(traceLevels.retryCat, s);
-		    }
-		    return cnt; // We must always retry, so we don't look at the retry count.
-		}
-		else
-		{
-		    //
-		    // For all other cases, we don't retry ObjectNotExistException.
-		    //
-		    throw ex;
-		}
-	    }
-	    else if(ex is Ice.RequestFailedException)
-	    {
-		throw ex;
-	    }
+                LocatorInfo li = @ref.getLocatorInfo();
+                if(li != null)
+                {
+                    //
+                    // We retry ObjectNotExistException if the reference is
+                    // indirect.
+                    //
+                    li.clearObjectCache((IndirectReference)@ref);
+                }
+                else if(@ref.getRouterInfo() != null && one.operation.Equals("ice_add_proxy"))
+                {
+                    //
+                    // If we have a router, an ObjectNotExistException with an
+                    // operation name "ice_add_proxy" indicates to the client
+                    // that the router isn't aware of the proxy (for example,
+                    // because it was evicted by the router). In this case, we
+                    // must *always* retry, so that the missing proxy is added
+                    // to the router.
+                    //
+                    if(traceLevels.retry >= 1)
+                    {
+                        string s = "retrying operation call to add proxy to router\n" + ex;
+                        logger.trace(traceLevels.retryCat, s);
+                    }
+                    return cnt; // We must always retry, so we don't look at the retry count.
+                }
+                else
+                {
+                    //
+                    // For all other cases, we don't retry ObjectNotExistException.
+                    //
+                    throw ex;
+                }
+            }
+            else if(ex is Ice.RequestFailedException)
+            {
+                throw ex;
+            }
 
             //
             // There is no point in retrying an operation that resulted in a
@@ -149,98 +149,98 @@ namespace IceInternal
             // of the batched requests were accepted, when in reality only the
             // last few are actually sent.
             //
-	    if(ex is Ice.MarshalException)
-	    {
-		throw ex;
-	    }
+            if(ex is Ice.MarshalException)
+            {
+                throw ex;
+            }
 
-	    ++cnt;
-	    Debug.Assert(cnt > 0);
+            ++cnt;
+            Debug.Assert(cnt > 0);
 
-	    if(cnt > _retryIntervals.Length)
-	    {
-	        if(traceLevels.retry >= 1)
-	        {
-	    	    string s = "cannot retry operation call because retry limit has been exceeded\n" + ex;
-	    	    logger.trace(traceLevels.retryCat, s);
-	        }
-	        throw ex;
-	    }
+            if(cnt > _retryIntervals.Length)
+            {
+                if(traceLevels.retry >= 1)
+                {
+                    string s = "cannot retry operation call because retry limit has been exceeded\n" + ex;
+                    logger.trace(traceLevels.retryCat, s);
+                }
+                throw ex;
+            }
 
-	    int interval = _retryIntervals[cnt - 1];
+            int interval = _retryIntervals[cnt - 1];
 
-	    if(traceLevels.retry >= 1)
-	    {
-	        string s = "retrying operation call";
-	        if(interval > 0)
-	        {
-	    	    s += " in " + interval + "ms";
-	        }
-	        s += " because of exception\n" + ex;
-	        logger.trace(traceLevels.retryCat, s);
-	    }
+            if(traceLevels.retry >= 1)
+            {
+                string s = "retrying operation call";
+                if(interval > 0)
+                {
+                    s += " in " + interval + "ms";
+                }
+                s += " because of exception\n" + ex;
+                logger.trace(traceLevels.retryCat, s);
+            }
 
-	    if(interval > 0)
-	    {
-	        //
-	        // Sleep before retrying.
-	        //
-	        System.Threading.Thread.Sleep(interval);
-	    }
+            if(interval > 0)
+            {
+                //
+                // Sleep before retrying.
+                //
+                System.Threading.Thread.Sleep(interval);
+            }
 
-	    return cnt;
-	}
+            return cnt;
+        }
 
-	//
-	// Only for use by Instance
-	//
-	internal ProxyFactory(Instance instance)
-	{
-	    instance_ = instance;
-	    
-	    string str = instance_.initializationData().properties.getPropertyWithDefault("Ice.RetryIntervals", "0");
-	    
-	    char[] separators = { ' ', '\t', '\n', '\r' };
-	    string[] arr = str.Trim().Split(separators);
-	    
-	    if(arr.Length > 0)
-	    {
-		_retryIntervals = new int[arr.Length];
-		
-		for (int i = 0; i < arr.Length; i++)
-		{
-		    int v;
-		    
-		    try
-		    {
-			v = System.Int32.Parse(arr[i]);
-		    }
-		    catch(System.FormatException)
-		    {
-			v = 0;
-		    }
-		    
-		    //
-		    // If -1 is the first value, no retry and wait intervals.
-		    // 
-		    if(i == 0 && v == -1)
-		    {
-			_retryIntervals = new int[0];
-			break;
-		    }
-		    
-		    _retryIntervals[i] = v > 0?v:0;
-		}
-	    }
-	    else
-	    {
-		_retryIntervals = new int[1];
-		_retryIntervals[0] = 0;
-	    }
-	}
-	
-	private Instance instance_;
-	private int[] _retryIntervals;
+        //
+        // Only for use by Instance
+        //
+        internal ProxyFactory(Instance instance)
+        {
+            instance_ = instance;
+            
+            string str = instance_.initializationData().properties.getPropertyWithDefault("Ice.RetryIntervals", "0");
+            
+            char[] separators = { ' ', '\t', '\n', '\r' };
+            string[] arr = str.Trim().Split(separators);
+            
+            if(arr.Length > 0)
+            {
+                _retryIntervals = new int[arr.Length];
+                
+                for (int i = 0; i < arr.Length; i++)
+                {
+                    int v;
+                    
+                    try
+                    {
+                        v = System.Int32.Parse(arr[i]);
+                    }
+                    catch(System.FormatException)
+                    {
+                        v = 0;
+                    }
+                    
+                    //
+                    // If -1 is the first value, no retry and wait intervals.
+                    // 
+                    if(i == 0 && v == -1)
+                    {
+                        _retryIntervals = new int[0];
+                        break;
+                    }
+                    
+                    _retryIntervals[i] = v > 0?v:0;
+                }
+            }
+            else
+            {
+                _retryIntervals = new int[1];
+                _retryIntervals[0] = 0;
+            }
+        }
+        
+        private Instance instance_;
+        private int[] _retryIntervals;
     }
 
 }