diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-17 19:17:28 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-17 19:17:28 +0000 |
| commit | e50c409b46f9a2df7f742164ab1b3d5f07158001 (patch) | |
| tree | 8ff3051edf75fa14f2eaf54909258a98b3aae890 | |
| parent | 923fe5e4638123ba693a566266859c768e323544 (diff) | |
| download | ATCD-e50c409b46f9a2df7f742164ab1b3d5f07158001.tar.gz | |
Thu Jun 17 19:16:55 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/NodeManager/Node_Manager_Module.h:
* DAnCE/NodeManager/Node_Manager_Module.cpp:
Store a reference in the POA in the property map.
Thu Jun 17 19:15:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/DAnCE/DAnCE_Properties.idl:
| -rw-r--r-- | CIAO/ChangeLog | 13 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp | 5 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/Node_Manager_Module.h | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7d453a9e654..df37a810791 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,13 +1,20 @@ +Thu Jun 17 19:16:55 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeManager/Node_Manager_Module.h: + * DAnCE/NodeManager/Node_Manager_Module.cpp: + + Store a reference in the POA in the property map. + Thu Jun 17 19:15:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/DAnCE/DAnCE_Properties.idl: - - Added property to indentify the entity POA. + + Added property to indentify the entity POA. * DAnCE/DAnCE/DAnCE_Utility.h: * DAnCE/DAnCE/DAnCE_Utility.tpp: - Added a utility method to extract exceptions from an Any. + Added a utility method to extract exceptions from an Any. Thu Jun 17 15:34:10 UTC 2010 Martin Corino <mcorino@remedy.nl> diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp index a4f057fb9e4..b0619e5fc46 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp +++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp @@ -599,6 +599,11 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::Utility::PROPERTY_MAP &pr } { CORBA::Any val; + val <<= this->root_poa_.in (); + props.bind (DAnCE::ENTITY_POA, val); + } + { + CORBA::Any val; val <<= CORBA::Any::from_string (CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (this->options_.cs_path_)),0); props.bind (DAnCE::LOCALITY_EXECUTABLE, val); } diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h index 6c51b7f2fab..88d69fd9360 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h +++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h @@ -82,6 +82,7 @@ class DAnCE_NodeManager_Module const ACE_TCHAR * server_args_; const ACE_TCHAR * domain_nc_; const ACE_TCHAR * instance_nc_; + unsigned int threads_; SOptions(); }; |