diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
| commit | d89f4f58ea4ab21661540c33f5e3481c67a758b1 (patch) | |
| tree | 4f9a09fb53e573863c29b62d6e7777eb83ee8873 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Fix some SRPM generation bugs, some copy commands and removed buildrequires (diff) | |
| download | ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.bz2 ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.xz ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.zip | |
Fixed a bug where IcePatch2 couldn't be deployed and used in a new
application.
Fixed deadlock.
Added automatic patching after adding an application.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index a142bf1ae2b..f885789b43c 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -174,8 +174,15 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at if(_admin && attributes("import-default-templates", "false") == "true") { - ApplicationDescriptor application = _admin->getDefaultApplicationDescriptor(); - _currentApplication.reset(new ApplicationDescriptorBuilder(application, attributes, _overrides)); + try + { + ApplicationDescriptor application = _admin->getDefaultApplicationDescriptor(); + _currentApplication.reset(new ApplicationDescriptorBuilder(application, attributes, _overrides)); + } + catch(const DeploymentException& ex) + { + throw ex.reason; + } } else { |