diff options
author | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
commit | 3d649bed4328992f41f567136025f58a019a5159 (patch) | |
tree | 470be901fbbfe5c6cd4269884412b0d36b48dc92 /cppe/test/IceE/operations/Collocated.cpp | |
parent | local interface fixes for slice2javae (diff) | |
download | ice-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/test/IceE/operations/Collocated.cpp')
-rw-r--r-- | cppe/test/IceE/operations/Collocated.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp index 467ce78063f..4285fbac0d2 100644 --- a/cppe/test/IceE/operations/Collocated.cpp +++ b/cppe/test/IceE/operations/Collocated.cpp @@ -26,26 +26,26 @@ public: virtual int run(int argc, char* argv[]) { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - // - // We must set MessageSizeMax to an explicit values, because - // we run tests to check whether Ice.MemoryLimitException is - // raised as expected. - // - initData.properties->setProperty("Ice.MessageSizeMax", "100"); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - - // - // Now parse argc/argv into initData.properties - // - initData.properties = Ice::createProperties(argc, argv, initData.properties); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(); + + // + // We must set MessageSizeMax to an explicit values, because + // we run tests to check whether Ice.MemoryLimitException is + // raised as expected. + // + initData.properties->setProperty("Ice.MessageSizeMax", "100"); + initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + + loadConfig(initData.properties); + + // + // Now parse argc/argv into initData.properties + // + initData.properties = Ice::createProperties(argc, argv, initData.properties); + + initData.logger = getLogger(); + setCommunicator(Ice::initialize(argc, argv, initData)); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator()->stringToIdentity("test")); |