http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1289

4 files changed, 19 insertions, 2 deletions

diff --git a/java/CHANGES b/java/CHANGES
index 9be5209b735..92c5e4e28bb 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -3,6 +3,9 @@ NOTE: Please keep changes in the appropriate section for HEAD or 3.1.
 Changes since version 3.1.1 (HEAD)
 ---------------------------     
 
+- Added Ice.Override.Secure which forces a client to only use
+  secure connections.
+
 - If a proxy contains no -h parameter, an Ice client will now attempt
   to connect using loopback as well as all other local interfaces.
 
diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/IceInternal/DefaultsAndOverrides.java
index c4680286abb..4dc7b824f4f 100644
--- a/java/src/IceInternal/DefaultsAndOverrides.java
+++ b/java/src/IceInternal/DefaultsAndOverrides.java
@@ -71,6 +71,18 @@ public final class DefaultsAndOverrides
 	    overrideCompressValue = false;
 	}
 
+	value = properties.getProperty("Ice.Override.Secure");
+	if(value.length() > 0)
+	{
+	    overrideSecure = true;
+	    overrideSecureValue = properties.getPropertyAsInt("Ice.Override.Secure") > 0;
+	}
+	else
+	{
+	    overrideSecure = false;
+	    overrideSecureValue = false;
+	}
+
 	defaultLocator = properties.getProperty("Ice.Default.Locator");
 
 	defaultCollocationOptimization =
@@ -92,4 +104,6 @@ public final class DefaultsAndOverrides
     final public int overrideConnectTimeoutValue;
     final public boolean overrideCompress;
     final public boolean overrideCompressValue;
+    final public boolean overrideSecure;
+    final public boolean overrideSecureValue;
 }
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 450a9a85b9e..aa8af85f51a 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -258,7 +258,7 @@ public class FixedReference extends Reference
         // endpoints come first.
         //
 	DefaultsAndOverrides overrides = getInstance().defaultsAndOverrides();
-        if(getSecure() || (overrides.overrideSecure && overrides.overrideSecureValue))
+	if(overrides.overrideSecure ? overrides.overrideSecureValue : getSecure())
         {
             java.util.Iterator i = connections.iterator();
             while(i.hasNext())
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index a45e5101404..c3a325f77fe 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -344,7 +344,7 @@ public abstract class RoutableReference extends Reference
         // endpoints come first.
         //
 	DefaultsAndOverrides overrides = getInstance().defaultsAndOverrides();
-        if(getSecure() || (overrides.overrideSecure && overrides.overrideSecureValue))
+	if(overrides.overrideSecure ? overrides.overrideSecureValue : getSecure())
         {
             java.util.Iterator i = endpoints.iterator();
             while(i.hasNext())