diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-06-14 09:46:20 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-06-14 09:46:20 +0000 |
| commit | be0f478d48d08725dd937529b8c1f1e4723d5ccd (patch) | |
| tree | 7399a3dcbce4d9528fca9e1311a29b80c9fbf684 /cpp/src | |
| parent | Fixed problem with write timeout detection under CE. (diff) | |
| download | ice-be0f478d48d08725dd937529b8c1f1e4723d5ccd.tar.bz2 ice-be0f478d48d08725dd937529b8c1f1e4723d5ccd.tar.xz ice-be0f478d48d08725dd937529b8c1f1e4723d5ccd.zip | |
Fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 55a42b49ff0..e9ef6838561 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -572,7 +572,6 @@ void ApplicationDescriptorHelper::endParsing() { _descriptor->variables = _variables->getCurrentScopeVariables(); - _variables->remove("application"); } const ApplicationDescriptorPtr& diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 38f07c95138..611df70109f 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -481,6 +481,7 @@ DescriptorHandler::getApplicationDescriptor() const { error("no application descriptor defined in this file"); } + _currentApplication->instantiate(); return _currentApplication->getDescriptor(); } |