diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
| commit | 96e45b30cd3dda2a13a029ef564a786a3546f316 (patch) | |
| tree | 97f4d030a2d8f8555cb4ed3b6d80802d80cda283 /cpp/demo/IceGrid/simple/Server.cpp | |
| parent | Fixed missing assignment (diff) | |
| parent | Fixed bug 2480 & 2481 (diff) | |
| download | ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.bz2 ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.xz ice-96e45b30cd3dda2a13a029ef564a786a3546f316.zip | |
Merge branch 'timer-fixes'
Diffstat (limited to 'cpp/demo/IceGrid/simple/Server.cpp')
| -rw-r--r-- | cpp/demo/IceGrid/simple/Server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp index d057cef9c68..cc865e3a52b 100644 --- a/cpp/demo/IceGrid/simple/Server.cpp +++ b/cpp/demo/IceGrid/simple/Server.cpp @@ -47,7 +47,7 @@ Server::run(int argc, char* argv[]) Ice::PropertiesPtr properties = communicator()->getProperties(); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity")); - adapter->add(new HelloI(properties->getProperty("Ice.ServerId")), id); + adapter->add(new HelloI(properties->getProperty("Ice.ProgramName")), id); adapter->activate(); communicator()->waitForShutdown(); return EXIT_SUCCESS; |