summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/deployer/Server.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-11-19 21:00:12 +0100
committerBenoit Foucher <benoit@zeroc.com>2007-11-19 21:00:12 +0100
commit0cc0aeba163d36f3fb765a800180333ed3d9e768 (patch)
tree11e4c7021236dbee33f5c28d65bcbcb1f76d85cd /cpp/test/IceGrid/deployer/Server.cpp
parentWin32 fix (diff)
downloadice-0cc0aeba163d36f3fb765a800180333ed3d9e768.tar.bz2
ice-0cc0aeba163d36f3fb765a800180333ed3d9e768.tar.xz
ice-0cc0aeba163d36f3fb765a800180333ed3d9e768.zip
Minor fix, added CHANGES comment for bug 2368
Diffstat (limited to 'cpp/test/IceGrid/deployer/Server.cpp')
-rw-r--r--cpp/test/IceGrid/deployer/Server.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp
index 977c9270c1b..9762e0143e2 100644
--- a/cpp/test/IceGrid/deployer/Server.cpp
+++ b/cpp/test/IceGrid/deployer/Server.cpp
@@ -32,7 +32,15 @@ Server::run(int argc, char* argv[])
string name = properties->getProperty("Ice.ProgramName");
- Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
+ Ice::ObjectAdapterPtr adapter;
+
+ if(!properties->getProperty("ReplicatedAdapter").empty())
+ {
+ adapter = communicator()->createObjectAdapter("ReplicatedAdapter");
+ adapter->activate();
+ }
+
+ adapter = communicator()->createObjectAdapter("Server");
Ice::ObjectPtr object = new TestI(adapter, properties);
adapter->add(object, communicator()->stringToIdentity(name));