Reference fixes:

- Moving _secure to RoutableReference
- Fixing changeDefault()
- Fixing changeRouter() and changeLocator() to return appropriate values

1 files changed, 27 insertions, 4 deletions

diff --git a/java/src/IceInternal/DirectReference.java b/java/src/IceInternal/DirectReference.java
index 7c7c4f7aa8c..627f39f32d8 100644
--- a/java/src/IceInternal/DirectReference.java
+++ b/java/src/IceInternal/DirectReference.java
@@ -44,15 +44,38 @@ public class DirectReference extends RoutableReference
     }
 
     public Reference
-    changeLocator(Ice.LocatorPrx newLocator)
+    changeDefault()
     {
-        return this;
+	//
+	// Return an indirect reference if a default locator is set.
+	//
+	Ice.LocatorPrx loc = getInstance().referenceFactory().getDefaultLocator();
+	if(loc != null)
+	{
+	    LocatorInfo newLocatorInfo = getInstance().locatorManager().get(loc);
+	    return getInstance().referenceFactory().create(getIdentity(), null, "", ModeTwoway, false, "", null,
+							   newLocatorInfo, false);
+	}
+	else
+	{
+	    return super.changeDefault();
+	}
     }
 
     public Reference
-    changeDefault()
+    changeLocator(Ice.LocatorPrx newLocator)
     {
-        return this;
+	if(newLocator != null)
+	{
+	    LocatorInfo newLocatorInfo = getInstance().locatorManager().get(newLocator);
+	    return getInstance().referenceFactory().create(getIdentity(), getContext(), getFacet(), getMode(),
+							   getSecure(), "", null, newLocatorInfo,
+							   getCollocationOptimization());
+	}
+	else
+	{
+	    return this;
+	}
     }
 
     public Reference