summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Application.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-04-07 13:43:58 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-04-07 13:43:58 +0000
commit3bc9a99c18f06527b7e14cc73b29a285fd4ec13e (patch)
tree65401c32f72cbd63c46c94129a40464a30a83aca /cpp/src/Ice/Application.cpp
parentFix (diff)
downloadice-3bc9a99c18f06527b7e14cc73b29a285fd4ec13e.tar.bz2
ice-3bc9a99c18f06527b7e14cc73b29a285fd4ec13e.tar.xz
ice-3bc9a99c18f06527b7e14cc73b29a285fd4ec13e.zip
Bug 803 - changed communicator initialization.
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
-rw-r--r--cpp/src/Ice/Application.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 074f9f690bc..a46ae1412e9 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -249,16 +249,14 @@ Ice::Application::main(int argc, char* argv[], const char* configFile, const Log
_appName = argv[0];
+ InitializationData initData;
+ initData.logger = logger;
if(configFile)
{
- PropertiesPtr properties = createProperties();
- properties->load(configFile);
- _communicator = initializeWithPropertiesAndLogger(argc, argv, properties, logger);
- }
- else
- {
- _communicator = initializeWithLogger(argc, argv, logger);
+ initData.properties = createProperties();
+ initData.properties->load(configFile);
}
+ _communicator = initialize(argc, argv, initData);
_destroyed = false;
//