summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-10-02 08:55:49 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-10-02 08:55:49 +0000
commite467312f8487f7d252756fd15935908d902b043f (patch)
tree7c5fbf7487a52e00633043d39d8fbc14fea8946d
parentd480eab34fcfc3771ed9ec14e7fcd5d8959769e1 (diff)
downloadATCD-e467312f8487f7d252756fd15935908d902b043f.tar.gz
Mon Oct 2 08:56:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp5
-rw-r--r--CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 89db1aa27b5..b0b2a3f2b19 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -91,7 +91,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
this->node_manager_->set_all_facets (comp_name, facets);
}
-
+
if (CIAO::debug_level () > 9)
{
ACE_DEBUG ((LM_DEBUG,
@@ -1126,10 +1126,11 @@ CIAO::Static_NodeApplicationManager_Impl::init (
ACE_UNUSED_ARG (nodeapp_op);
ACE_UNUSED_ARG (delay);
ACE_UNUSED_ARG (callback_poa);
- ACE_UNUSED_ARG (nm);
ACE_TRY
{
+ this->node_manager_ = nm;
+
// Make a copy of the plan for later usage.
this->plan_ = plan;
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 498069f0299..c0312cd6384 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -394,8 +394,8 @@ namespace CIAO
/// Destructor
virtual ~Static_NodeApplicationManager_Impl (void);
- // Internal help function to create new NodeApplicationProcess
- // Here we override it to create an in-process NodeApplication object
+ /// Internal help function to create new NodeApplicationProcess
+ /// Here we override it to create an in-process NodeApplication object
virtual Deployment::NodeApplication_ptr
create_node_application (const ACE_CString & options
ACE_ENV_ARG_DECL_WITH_DEFAULTS)