diff options
| author | Jose <jose@zeroc.com> | 2016-03-10 23:48:38 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-10 23:48:38 +0100 |
| commit | 71c75b16f3d7a0bf4888420c7d24219217615e7f (patch) | |
| tree | cc26d4f07203264dd610659529ae4d69da40bfe9 /cpp/src/IceGrid/Database.cpp | |
| parent | C# doc comment fix (diff) | |
| parent | Windows wide string literal fixes (diff) | |
| download | ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.tar.bz2 ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.tar.xz ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.zip | |
Merge branch '3.6'
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 973f39272b3..b51c056048b 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1096,7 +1096,7 @@ Database::getAdapterDirectProxy(const string& id, const Ice::EncodingVersion& en filterAdapterInfos("", id, _pluginFacade, con, ctx, infos); for(unsigned int i = 0; i < infos.size(); ++i) { - if(infos[i].proxy->ice_getEncodingVersion() < encoding) + if(IceInternal::isSupported(encoding, infos[i].proxy->ice_getEncodingVersion())) { Ice::EndpointSeq edpts = infos[i].proxy->ice_getEndpoints(); endpoints.insert(endpoints.end(), edpts.begin(), edpts.end()); |