1 files changed, 157 insertions, 157 deletions

diff --git a/java/src/IceInternal/IndirectReference.java b/java/src/IceInternal/IndirectReference.java
index 0d118427797..004d63350dc 100644
--- a/java/src/IceInternal/IndirectReference.java
+++ b/java/src/IceInternal/IndirectReference.java
@@ -13,27 +13,27 @@ public class IndirectReference extends RoutableReference
 {
     public
     IndirectReference(Instance inst,
-		      Ice.Communicator com,
-    		      Ice.Identity ident,
-		      java.util.Map ctx,
-		      String fs,
-		      int md,
-		      boolean sec,
-		      boolean prefSec,
-		      String adptid,
-		      RouterInfo rtrInfo,
-		      LocatorInfo locInfo,
-		      boolean collocationOpt,
+                      Ice.Communicator com,
+                      Ice.Identity ident,
+                      java.util.Map ctx,
+                      String fs,
+                      int md,
+                      boolean sec,
+                      boolean prefSec,
+                      String adptid,
+                      RouterInfo rtrInfo,
+                      LocatorInfo locInfo,
+                      boolean collocationOpt,
                       boolean cacheConnection,
                       Ice.EndpointSelectionType endpointSelection,
                       boolean threadPerConnection,
-		      int locatorCacheTimeout)
+                      int locatorCacheTimeout)
     {
-    	super(inst, com, ident, ctx, fs, md, sec, prefSec, rtrInfo, collocationOpt, cacheConnection, endpointSelection,
+        super(inst, com, ident, ctx, fs, md, sec, prefSec, rtrInfo, collocationOpt, cacheConnection, endpointSelection,
               threadPerConnection);
         _adapterId = adptid;
-	_locatorInfo = locInfo;
-	_locatorCacheTimeout = locatorCacheTimeout;
+        _locatorInfo = locInfo;
+        _locatorCacheTimeout = locatorCacheTimeout;
     }
 
     public final LocatorInfo
@@ -57,217 +57,217 @@ public class IndirectReference extends RoutableReference
     public int
     getLocatorCacheTimeout()
     {
-	return _locatorCacheTimeout;
+        return _locatorCacheTimeout;
     }
 
     public Reference
     changeLocator(Ice.LocatorPrx newLocator)
     {
-	LocatorInfo newLocatorInfo = getInstance().locatorManager().get(newLocator);
-	if(_locatorInfo != null && newLocatorInfo != null && newLocatorInfo.equals(_locatorInfo))
-	{
-	    return this;
-	}
-	IndirectReference r = (IndirectReference)getInstance().referenceFactory().copy(this);
-	r._locatorInfo = newLocatorInfo;
-	return r;
+        LocatorInfo newLocatorInfo = getInstance().locatorManager().get(newLocator);
+        if(_locatorInfo != null && newLocatorInfo != null && newLocatorInfo.equals(_locatorInfo))
+        {
+            return this;
+        }
+        IndirectReference r = (IndirectReference)getInstance().referenceFactory().copy(this);
+        r._locatorInfo = newLocatorInfo;
+        return r;
     }
 
     public Reference
     changeAdapterId(String newAdapterId)
     {
-	if(_adapterId.equals(newAdapterId))
-	{
-	    return this;
-	}
+        if(_adapterId.equals(newAdapterId))
+        {
+            return this;
+        }
         IndirectReference r = (IndirectReference)getInstance().referenceFactory().copy(this);
-	r._adapterId = newAdapterId;
-	return r;	
+        r._adapterId = newAdapterId;
+        return r;       
     }
 
     public Reference
     changeEndpoints(EndpointI[] newEndpoints)
     {
-	if(newEndpoints == null || newEndpoints.length == 0)
-	{
-	    return this;
-	}
-	return getInstance().referenceFactory().create(getIdentity(), getContext(), getFacet(), getMode(),
-						       getSecure(), getPreferSecure(), newEndpoints, getRouterInfo(),
-						       getCollocationOptimization(), getCacheConnection(),
+        if(newEndpoints == null || newEndpoints.length == 0)
+        {
+            return this;
+        }
+        return getInstance().referenceFactory().create(getIdentity(), getContext(), getFacet(), getMode(),
+                                                       getSecure(), getPreferSecure(), newEndpoints, getRouterInfo(),
+                                                       getCollocationOptimization(), getCacheConnection(),
                                                        getEndpointSelection(), getThreadPerConnection());
     }
 
     public Reference
     changeLocatorCacheTimeout(int newTimeout)
     {
-	if(_locatorCacheTimeout == newTimeout)
-	{
-	    return this;
-	}
+        if(_locatorCacheTimeout == newTimeout)
+        {
+            return this;
+        }
         IndirectReference r = (IndirectReference)getInstance().referenceFactory().copy(this);
-	r._locatorCacheTimeout = newTimeout;
-	return r;	
+        r._locatorCacheTimeout = newTimeout;
+        return r;       
     }
 
     public void
     streamWrite(BasicStream s)
-	throws Ice.MarshalException
+        throws Ice.MarshalException
     {
         super.streamWrite(s);
 
-	s.writeSize(0);
-	s.writeString(_adapterId);
+        s.writeSize(0);
+        s.writeString(_adapterId);
     }
 
     public String
     toString()
     {
-	//
-	// WARNING: Certain features, such as proxy validation in Glacier2,
-	// depend on the format of proxy strings. Changes to toString() and
-	// methods called to generate parts of the reference string could break
-	// these features. Please review for all features that depend on the
-	// format of proxyToString() before changing this and related code.
-	//
+        //
+        // WARNING: Certain features, such as proxy validation in Glacier2,
+        // depend on the format of proxy strings. Changes to toString() and
+        // methods called to generate parts of the reference string could break
+        // these features. Please review for all features that depend on the
+        // format of proxyToString() before changing this and related code.
+        //
         String result = super.toString();
 
-	if(_adapterId.length() == 0)
-	{
-	    return result;
-	}
+        if(_adapterId.length() == 0)
+        {
+            return result;
+        }
 
-	StringBuffer s = new StringBuffer();
-	s.append(result);
-	s.append(" @ ");
+        StringBuffer s = new StringBuffer();
+        s.append(result);
+        s.append(" @ ");
 
-	//
-	// If the encoded adapter id string contains characters which
-	// the reference parser uses as separators, then we enclose
-	// the adapter id string in quotes.
-	//
-	String a = IceUtil.StringUtil.escapeString(_adapterId, null);
-	if(IceUtil.StringUtil.findFirstOf(a, " \t\n\r") != -1)
-	{
-	    s.append('"');
-	    s.append(a);
-	    s.append('"');
-	}
-	else
-	{
-	    s.append(a);
-	}
-	return s.toString();
+        //
+        // If the encoded adapter id string contains characters which
+        // the reference parser uses as separators, then we enclose
+        // the adapter id string in quotes.
+        //
+        String a = IceUtil.StringUtil.escapeString(_adapterId, null);
+        if(IceUtil.StringUtil.findFirstOf(a, " \t\n\r") != -1)
+        {
+            s.append('"');
+            s.append(a);
+            s.append('"');
+        }
+        else
+        {
+            s.append(a);
+        }
+        return s.toString();
     }
 
     public Ice.ConnectionI
     getConnection(Ice.BooleanHolder comp)
     {
-	Ice.ConnectionI connection;
+        Ice.ConnectionI connection;
 
-	while(true)
-	{
-	    EndpointI[] endpts = super.getRoutedEndpoints();
-	    Ice.BooleanHolder cached = new Ice.BooleanHolder(false);
-	    if(endpts.length == 0 && _locatorInfo != null)
-	    {
-	        endpts = _locatorInfo.getEndpoints(this, _locatorCacheTimeout, cached);
-	    }
+        while(true)
+        {
+            EndpointI[] endpts = super.getRoutedEndpoints();
+            Ice.BooleanHolder cached = new Ice.BooleanHolder(false);
+            if(endpts.length == 0 && _locatorInfo != null)
+            {
+                endpts = _locatorInfo.getEndpoints(this, _locatorCacheTimeout, cached);
+            }
 
-	    applyOverrides(endpts);
+            applyOverrides(endpts);
 
-	    try
-	    {
-		connection = createConnection(endpts, comp);
-		assert(connection != null);
-	    }
-	    catch(Ice.NoEndpointException ex)
-	    {
-		throw ex; // No need to retry if there's no endpoints.
-	    }
-	    catch(Ice.LocalException ex)
-	    {
-		if(getRouterInfo() == null)
-		{
-		    assert(_locatorInfo != null);
-		    _locatorInfo.clearCache(this);
+            try
+            {
+                connection = createConnection(endpts, comp);
+                assert(connection != null);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                throw ex; // No need to retry if there's no endpoints.
+            }
+            catch(Ice.LocalException ex)
+            {
+                if(getRouterInfo() == null)
+                {
+                    assert(_locatorInfo != null);
+                    _locatorInfo.clearCache(this);
 
-		    if(cached.value)
-		    {
-			TraceLevels traceLevels = getInstance().traceLevels();
-			
-			if(traceLevels.retry >= 2)
-			{
-			    String s = "connection to cached endpoints failed\n" +
-				       "removing endpoints from cache and trying one more time\n" + ex;
-			    getInstance().initializationData().logger.trace(traceLevels.retryCat, s);
-			}
-			
-			continue;
-		    }
-		}
+                    if(cached.value)
+                    {
+                        TraceLevels traceLevels = getInstance().traceLevels();
+                        
+                        if(traceLevels.retry >= 2)
+                        {
+                            String s = "connection to cached endpoints failed\n" +
+                                       "removing endpoints from cache and trying one more time\n" + ex;
+                            getInstance().initializationData().logger.trace(traceLevels.retryCat, s);
+                        }
+                        
+                        continue;
+                    }
+                }
 
-		throw ex;
-	    }
+                throw ex;
+            }
 
-	    break;
-	}
+            break;
+        }
 
-	//
-	// If we have a router, set the object adapter for this router
-	// (if any) to the new connection, so that callbacks from the
-	// router can be received over this new connection.
-	//
-	if(getRouterInfo() != null)
-	{
-	    connection.setAdapter(getRouterInfo().getAdapter());
-	}
+        //
+        // If we have a router, set the object adapter for this router
+        // (if any) to the new connection, so that callbacks from the
+        // router can be received over this new connection.
+        //
+        if(getRouterInfo() != null)
+        {
+            connection.setAdapter(getRouterInfo().getAdapter());
+        }
 
-	assert(connection != null);
-	return connection;
+        assert(connection != null);
+        return connection;
     }
 
     public synchronized int
     hashCode()
     {
         if(_hashInitialized)
-	{
-	    return _hashValue;
-	}
-	super.hashCode();             // Initializes _hashValue.
-	int sz = _adapterId.length(); // Add hash of adapter ID to base hash.
-	for(int i = 0; i < sz; i++)
-	{   
-	    _hashValue = 5 * _hashValue + (int)_adapterId.charAt(i);
-	}
-	return _hashValue;
+        {
+            return _hashValue;
+        }
+        super.hashCode();             // Initializes _hashValue.
+        int sz = _adapterId.length(); // Add hash of adapter ID to base hash.
+        for(int i = 0; i < sz; i++)
+        {   
+            _hashValue = 5 * _hashValue + (int)_adapterId.charAt(i);
+        }
+        return _hashValue;
     }
 
     public boolean
     equals(java.lang.Object obj)
     {
         if(this == obj)
-	{
-	    return true;
-	}
-	if(!(obj instanceof IndirectReference))
-	{
-	    return false;
-	}
+        {
+            return true;
+        }
+        if(!(obj instanceof IndirectReference))
+        {
+            return false;
+        }
         IndirectReference rhs = (IndirectReference)obj;
         if(!super.equals(rhs))
         {
             return false;
         }
-	if(!_adapterId.equals(rhs._adapterId))
-	{
-	   return false;
-	}
-	if(_locatorInfo == null ? rhs._locatorInfo != null : !_locatorInfo.equals(rhs._locatorInfo))
-	{
-	    return false;
-	}
-	return _locatorCacheTimeout == rhs._locatorCacheTimeout;
+        if(!_adapterId.equals(rhs._adapterId))
+        {
+           return false;
+        }
+        if(_locatorInfo == null ? rhs._locatorInfo != null : !_locatorInfo.equals(rhs._locatorInfo))
+        {
+            return false;
+        }
+        return _locatorCacheTimeout == rhs._locatorCacheTimeout;
     }
 
     private String _adapterId;