Reference fixes:

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

1 files changed, 2 insertions, 4 deletions

diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index fb089380d0a..13c97e1732c 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -64,7 +64,7 @@ public final class ReferenceFactory
         // Create new reference
         //
         IndirectReference ref = new IndirectReference(_instance, ident, context, facet, mode, secure,
-						    adapterId, routerInfo, locatorInfo, collocationOptimization);
+						      adapterId, routerInfo, locatorInfo, collocationOptimization);
 	return updateCache(ref);
     }
 
@@ -73,8 +73,6 @@ public final class ReferenceFactory
            java.util.Map context,
            String facet,
            int mode,
-           boolean secure,
-	   boolean collocationOptimization,
 	   Ice.ConnectionI[] fixedConnections)
     {
         if(_instance == null)
@@ -90,7 +88,7 @@ public final class ReferenceFactory
         //
         // Create new reference
         //
-        FixedReference ref = new FixedReference(_instance, ident, context, facet, mode, secure, fixedConnections);
+        FixedReference ref = new FixedReference(_instance, ident, context, facet, mode, fixedConnections);
 	return updateCache(ref);
     }