diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-07 14:40:54 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-07 14:40:54 +0000 |
| commit | 6372abdc7e9403d6a35767734f3baf0536bbe841 (patch) | |
| tree | 65fbb999c06d11a4276c5dfcbc06261ed18caab2 /CIAO | |
| parent | a4c61cb2a4046ff8a3ae8424bceadd1ff2bef4ea (diff) | |
| download | ATCD-6372abdc7e9403d6a35767734f3baf0536bbe841.tar.gz | |
ChangeLogTag: Tue Apr 7 14:40:41 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7ac35efc4be..de7d94a2406 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,9 +1,15 @@ +Tue Apr 7 14:40:41 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Fuzz error. + Tue Apr 7 14:37:18 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Compile error. - + Compile error. + Mon Apr 6 18:18:58 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/NodeApplication/Name_Utilities.cpp: diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 0633da04054..b242c1a24af 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -281,9 +281,9 @@ NodeApplication_Impl::~NodeApplication_Impl() try { - if (!CORBA::is_nil (container.ref)) - server.ref->remove_container (container.ref.in ()); - + if (!CORBA::is_nil (container.ref)) + server.ref->remove_container (container.ref.in ()); + container.ref = CIAO::Deployment::Container::_nil (); } catch (const CORBA::Exception &ex) @@ -305,8 +305,8 @@ NodeApplication_Impl::~NodeApplication_Impl() try { - if (!CORBA::is_nil (server.ref)) - this->activator_->remove_component_server (server.ref.in ()); + if (!CORBA::is_nil (server.ref)) + this->activator_->remove_component_server (server.ref.in ()); } catch (const CORBA::Exception &ex) { |