diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-09-11 08:33:10 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-09-11 08:33:10 +0000 |
| commit | 880d8bf4b6c4764467c3cdfbac5b48633a04e0b8 (patch) | |
| tree | 880e74e1d68f2187fae80a42c0257fdd22e9b933 /java/src/IceInternal/RoutableReference.java | |
| parent | file TestI.h was initially added on branch twoThreadsPerConnection. (diff) | |
| download | ice-880d8bf4b6c4764467c3cdfbac5b48633a04e0b8.tar.bz2 ice-880d8bf4b6c4764467c3cdfbac5b48633a04e0b8.tar.xz ice-880d8bf4b6c4764467c3cdfbac5b48633a04e0b8.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1289
Diffstat (limited to 'java/src/IceInternal/RoutableReference.java')
| -rw-r--r-- | java/src/IceInternal/RoutableReference.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java index a41f872775f..a45e5101404 100644 --- a/java/src/IceInternal/RoutableReference.java +++ b/java/src/IceInternal/RoutableReference.java @@ -337,12 +337,14 @@ public abstract class RoutableReference extends Reference } // - // If a secure connection is requested, remove all non-secure - // endpoints. Otherwise make non-secure endpoints preferred over - // secure endpoints by partitioning the endpoint vector, so that - // non-secure endpoints come first. + // If a secure connection is requested or secure overrides is + // set, remove all non-secure endpoints. Otherwise make + // non-secure endpoints preferred over secure endpoints by + // partitioning the endpoint vector, so that non-secure + // endpoints come first. // - if(getSecure()) + DefaultsAndOverrides overrides = getInstance().defaultsAndOverrides(); + if(getSecure() || (overrides.overrideSecure && overrides.overrideSecureValue)) { java.util.Iterator i = endpoints.iterator(); while(i.hasNext()) |