diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-17 13:01:48 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-17 13:01:48 +0000 |
| commit | f07d433bf702aba9cd2ca81806446b18efb94f78 (patch) | |
| tree | cea81b447f28550d4b8707d7f2b730fbf75a8f86 /CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | |
| parent | 52da6c4d92bab16bdd45911f8d66e4db321c0009 (diff) | |
| download | ATCD-f07d433bf702aba9cd2ca81806446b18efb94f78.tar.gz | |
Thu Jun 17 12:57:10 UTC 2010 Martin Corino <mcorino@remedy.nl>
* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
Clean up.
* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
* DAnCE/DomainApplication/Domain_Application_Impl.cpp:
* DAnCE/Plan_Launcher/Plan_Launcher.cpp:
Fixed plan teardown; added missing destroy of managers in process.
Added -f|--force argument to plan launcher.
Diffstat (limited to 'CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp')
| -rw-r--r-- | CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 0452f261879..e1c64647965 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -513,8 +513,8 @@ DomainApplicationManager_Impl::destroyManager (DAM_CompletionHandler* completion } else { - // nothing to destroy, complete - _ch_ptr->handle_completion (this); + // no applications to destroy so finish immediately + this->finishDestroyManager (_ch_ptr); } } catch (Deployment::StopError &e) |