summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/exceptions/Collocated.cpp
diff options
context:
space:
mode:
authorAnthony Neal <aneal@zeroc.com>2001-11-13 15:42:30 +0000
committerAnthony Neal <aneal@zeroc.com>2001-11-13 15:42:30 +0000
commitfcd722bf5050ea9f3b96288bc30fe539744b3e00 (patch)
treeaaee49bc6dc47c3abd88b3b0c2abe91dd3f2a824 /cpp/test/Ice/exceptions/Collocated.cpp
parentminor fixes (diff)
downloadice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.tar.bz2
ice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.tar.xz
ice-fcd722bf5050ea9f3b96288bc30fe539744b3e00.zip
Incorporates SSL, with all Ice tests running under SSL.
Diffstat (limited to 'cpp/test/Ice/exceptions/Collocated.cpp')
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 0690354f4fc..c7e199b9eff 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -16,7 +16,16 @@ using namespace std;
int
run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
{
- string endpts("tcp -p 12345 -t 2000");
+ Ice::PropertiesPtr properties = communicator->getProperties();
+
+ string protocol = properties->getProperty("Ice.Protocol");
+
+ if (protocol.empty())
+ {
+ protocol = "tcp";
+ }
+
+ string endpts = protocol + " -p 12345 -t 2000";
Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts);
Ice::ObjectPtr object = new ThrowerI(adapter);
adapter->add(object, "thrower");