summaryrefslogtreecommitdiff
path: root/cpp/src/Glacier2Lib/SessionHelper.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-29 18:04:18 +0100
committerJose <jose@zeroc.com>2016-02-29 18:04:18 +0100
commit97554afcad548fcac64d399fd2e05af49ffcba12 (patch)
tree6916a256775181b7674f39ad7b3f3eeaa1fdfa62 /cpp/src/Glacier2Lib/SessionHelper.cpp
parentICE-6952 - identityToString/stringToIdentity non member functions (diff)
downloadice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.bz2
ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.xz
ice-97554afcad548fcac64d399fd2e05af49ffcba12.zip
Rework previous fix for 3.6 compatibility
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 623e0a2a869..7ce2d2c3eb9 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1162,7 +1162,17 @@ string
Glacier2::SessionFactoryHelper::createProxyStr(const Ice::Identity& ident)
{
ostringstream os;
- os << "\"" << Ice::identityToString(ident) << "\":" << _protocol << " -p " << getPortInternal() << " -h \"" << _routerHost << "\"";
+ os << "\"";
+ //
+ // TODO replace with identityToString, we cannot use the Communicator::identityToString
+ // current implementation because we need to do that before the communicator has been
+ // initialized.
+ //
+ if(!ident.category.empty())
+ {
+ os << ident.category << "/";
+ }
+ os << ident.name << "\":" << _protocol << " -p " << getPortInternal() << " -h \"" << _routerHost << "\"";
if(_timeout > 0)
{
os << " -t " << _timeout;