diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
| commit | f185946cfbced2bf5e6bf8deb0993a18057664d5 (patch) | |
| tree | 8a2de32151d5dc71bd0353feefa21de018e85f2f /cpp/test/IceGrid/activation/Server.cpp | |
| parent | fix for compilation errors with Python 2.5 (diff) | |
| download | ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.bz2 ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.xz ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.zip | |
Squashed commit of the following:
commit 2eba3087584d54d3ba98ef50724710fd34d84e0b
Author: Bernard Normier <bernard@zeroc.com>
Date: Thu Sep 20 15:53:49 2007 -0400
New ice-version attribute, IceGrid now generates Ice.Admin.* properties
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) |