diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-09-11 09:01:32 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-09-11 09:01:32 +0000 |
| commit | ab3d165e4c54ddee29cdadf08819aa74e60be819 (patch) | |
| tree | f62deff48ccc8c167af056e6c80347129a0fb945 /cpp/src/Ice/Reference.cpp | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1289 (diff) | |
| download | ice-ab3d165e4c54ddee29cdadf08819aa74e60be819.tar.bz2 ice-ab3d165e4c54ddee29cdadf08819aa74e60be819.tar.xz ice-ab3d165e4c54ddee29cdadf08819aa74e60be819.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1289
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 8c1c0f80c6e..7abdd03bc66 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -675,7 +675,7 @@ IceInternal::FixedReference::filterConnections(const vector<ConnectionIPtr>& all // first. // DefaultsAndOverridesPtr overrides = getInstance()->defaultsAndOverrides(); - if(getSecure() || (overrides->overrideSecure && overrides->overrideSecureValue)) + if(overrides->overrideSecure ? overrides->overrideSecureValue : getSecure()) { connections.erase(remove_if(connections.begin(), connections.end(), not1(ConnectionIsSecure())), connections.end()); @@ -1093,7 +1093,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all // endpoint vector, so that non-secure endpoints come first. // DefaultsAndOverridesPtr overrides = getInstance()->defaultsAndOverrides(); - if(getSecure() || (overrides->overrideSecure && overrides->overrideSecureValue)) + if(overrides->overrideSecure ? overrides->overrideSecureValue : getSecure()) { endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), not1(Ice::constMemFun(&EndpointI::secure))), endpoints.end()); |