diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/DefaultsAndOverrides.java | 14 | ||||
| -rw-r--r-- | java/src/IceInternal/FixedReference.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/RoutableReference.java | 2 |
3 files changed, 16 insertions, 2 deletions
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()) |