summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Application.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2011-05-10 16:19:07 +0200
committerJose <jose@zeroc.com>2011-05-10 16:19:07 +0200
commit48352a730b8b3c73ade3aca7a20453a2abb60467 (patch)
treeaca09f7f5b3b7eed21f9936eb4bf13e63c86412e /cpp/src/Ice/Application.cpp
parentupdating CHANGES for .NET CF (diff)
downloadice-48352a730b8b3c73ade3aca7a20453a2abb60467.tar.bz2
ice-48352a730b8b3c73ade3aca7a20453a2abb60467.tar.xz
ice-48352a730b8b3c73ade3aca7a20453a2abb60467.zip
4920 - Glacier2 Application _application pointer not initialized
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
-rw-r--r--cpp/src/Ice/Application.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index da88207dd81..b48c539ee6b 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -379,6 +379,8 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
}
int status;
+ IceInternal::Application::_application = this;
+
//
// We parse the properties here to extract Ice.ProgramName.
//
@@ -649,7 +651,6 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), ""));
}
- IceInternal::Application::_application = this;
IceInternal::Application::_communicator = initialize(argc, argv, initData);
IceInternal::Application::_destroyed = false;