summaryrefslogtreecommitdiff
path: root/cppe/demo/IceE/bidir/Server.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-06-03 19:32:20 -0700
committerMark Spruiell <mes@zeroc.com>2008-06-03 19:32:20 -0700
commit3d649bed4328992f41f567136025f58a019a5159 (patch)
tree470be901fbbfe5c6cd4269884412b0d36b48dc92 /cppe/demo/IceE/bidir/Server.cpp
parentlocal interface fixes for slice2javae (diff)
downloadice-3d649bed4328992f41f567136025f58a019a5159.tar.bz2
ice-3d649bed4328992f41f567136025f58a019a5159.tar.xz
ice-3d649bed4328992f41f567136025f58a019a5159.zip
Various Ice-E fixes:
- Bug fix in slice2javae for local interfaces/classes - Added Ice.LocalObjectHolder - Reviewed Java/C++ demos and aligned with Ice - Source code clean up (removed tabs, etc.)
Diffstat (limited to 'cppe/demo/IceE/bidir/Server.cpp')
-rw-r--r--cppe/demo/IceE/bidir/Server.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/demo/IceE/bidir/Server.cpp b/cppe/demo/IceE/bidir/Server.cpp
index 949fb23d2df..08b07d343de 100644
--- a/cppe/demo/IceE/bidir/Server.cpp
+++ b/cppe/demo/IceE/bidir/Server.cpp
@@ -29,12 +29,12 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
sender->start();
try
{
- communicator->waitForShutdown();
+ communicator->waitForShutdown();
}
catch(...)
{
- sender->destroy();
- throw;
+ sender->destroy();
+ throw;
}
sender->destroy();
@@ -51,7 +51,7 @@ main(int argc, char* argv[])
{
Ice::InitializationData initData;
initData.properties = Ice::createProperties();
- initData.properties->load("config");
+ initData.properties->load("config.server");
communicator = Ice::initialize(argc, argv, initData);
status = run(argc, argv, communicator);
}