summaryrefslogtreecommitdiff
path: root/cpp/test/Glacier2/sessionHelper/Client.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-12-15 16:29:45 +0100
committerJose <jose@zeroc.com>2014-12-15 16:29:45 +0100
commit46fb5ce4d7115bbdebd938cedb0481d23c5572ea (patch)
treecadff301f7e4ffd9b842f87991e9563a3ab0e066 /cpp/test/Glacier2/sessionHelper/Client.cpp
parentFix: Missing quotes in endpoints (diff)
downloadice-46fb5ce4d7115bbdebd938cedb0481d23c5572ea.tar.bz2
ice-46fb5ce4d7115bbdebd938cedb0481d23c5572ea.tar.xz
ice-46fb5ce4d7115bbdebd938cedb0481d23c5572ea.zip
Fixed (ICE-6179) - SessionHelper classes create bogus endpoint when use ipv6 address
Diffstat (limited to 'cpp/test/Glacier2/sessionHelper/Client.cpp')
-rw-r--r--cpp/test/Glacier2/sessionHelper/Client.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 0cb9020cbbb..0290fcf85f7 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -228,6 +228,7 @@ public:
{
instance = this;
string protocol = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+ string host = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
_initData.properties = Ice::createProperties(argc, argv, communicator()->getProperties());
_initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347");
@@ -260,7 +261,7 @@ public:
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
cout << "testing SessionHelper connect... " << flush;
- _factory->setRouterHost("localhost");
+ _factory->setRouterHost(host);
_factory->setPort(12347);
_factory->setProtocol(protocol);
_session = _factory->connect("userid", "abc123");
@@ -370,7 +371,7 @@ public:
Ice::ObjectPrx processBase;
{
cout << "testing stringToProxy for process object... " << flush;
- processBase = communicator()->stringToProxy("Glacier2/admin -f Process:default -h localhost -p 12348");
+ processBase = communicator()->stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348");
cout << "ok" << endl;
}
@@ -407,7 +408,7 @@ public:
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
cout << "testing SessionHelper connect after router shutdown... " << flush;
- _factory->setRouterHost("localhost");
+ _factory->setRouterHost(host);
_factory->setPort(12347);
_factory->setProtocol(protocol);
_session = _factory->connect("userid", "abc123");