diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
| commit | 88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc (patch) | |
| tree | 4c11a58a1140221011e78167aff165ef16cab553 /cpp/test/IceGrid/activation/Server.cpp | |
| parent | minor cleanup in IcePy (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.bz2 ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.xz ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/test/IceGrid/activation/Server.cpp')
| -rw-r--r-- | cpp/test/IceGrid/activation/Server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/activation/Server.cpp b/cpp/test/IceGrid/activation/Server.cpp index 721c2132427..fe73297e8f7 100644 --- a/cpp/test/IceGrid/activation/Server.cpp +++ b/cpp/test/IceGrid/activation/Server.cpp @@ -36,7 +36,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); TestI* test = new TestI(adapter); Ice::ObjectPtr obj = test; - adapter->add(test, communicator()->stringToIdentity(properties->getProperty("Ice.ServerId"))); + adapter->add(test, communicator()->stringToIdentity(properties->getProperty("Ice.Admin.ServerId"))); int delay = properties->getPropertyAsInt("ActivationDelay"); if(delay > 0) |