diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-05 20:36:33 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-05 20:36:33 +0000 |
| commit | 96a1b71771c151f6e243e9a26963697655fd70a5 (patch) | |
| tree | 4fb3decc622b002308e72f0ac7bff80c5e6d999b /CIAO | |
| parent | 5c3cb6aee45306e5beb1c981b27d0ea4f50280ee (diff) | |
| download | ATCD-96a1b71771c151f6e243e9a26963697655fd70a5.tar.gz | |
ChangeLogTag: Sun Apr 5 20:34:22 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 15 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc | 2 | ||||
| -rw-r--r-- | CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 85cd8cebe63..601b19752e3 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Sun Apr 5 20:34:22 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: + + Changed parent from ciao_logger to dance_logger. + + * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: + + Properly check if _var is nil. + Sat Apr 4 15:30:13 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: @@ -8,8 +18,13 @@ Sat Apr 4 03:39:28 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: * ciao/ComponentServer/CIAO_Container_Impl.cpp: +<<<<<<< .mine + Ficed a couple memory management issues. + +======= Fixed a couple memory management issues. +>>>>>>> .r85023 Mon Mar 23 12:51:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Logger/File_Logger_Backend.h diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc index df08b72b990..1f0d913dd3f 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc @@ -1,5 +1,5 @@ // $Id$ -project(simple_nm_launcher) : ciao_config_handlers, dance_nodemanager_stub, ciao_logger { +project(simple_nm_launcher) : ciao_config_handlers, dance_nodemanager_stub, dance_logger { Source_Files { simple_nm_launcher.cpp } diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp index c215e584376..dd578cdee05 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp @@ -239,7 +239,7 @@ namespace CIAO CIAO_ComponentServer_i::init (::Components::Deployment::ServerActivator_ptr sa, Components::ConfigValues *cvs) { - if (sa != 0) + if (!CORBA::is_nil (sa != 0)) this->serv_act_ = ::Components::Deployment::ServerActivator::_duplicate(sa); if (cvs != 0) |