diff options
| author | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-10 17:57:31 +0000 |
|---|---|---|
| committer | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-10 17:57:31 +0000 |
| commit | 1b823fe566b66719a233dce892ac9a97d6e29373 (patch) | |
| tree | 2fa41400a7aaded509f2fd555f90ba52b4a7f280 | |
| parent | 767ac9600bfca37a8f79e7207593ebfb1d3fb57d (diff) | |
| download | ATCD-1b823fe566b66719a233dce892ac9a97d6e29373.tar.gz | |
ChangeLog Tag: Tue Oct 10 17:56:51 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index d00d3cdabbf..850003c037f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 10 17:56:51 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp + * DAnCE/NodeApplicationManager/Containers_Info_Map.h + Modify these files to get the artifacts names when using http reference. + Tue Oct 10 14:24:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index 1129a3a822c..01808650980 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -276,7 +276,9 @@ namespace CIAO if (ACE_OS::strstr (arti.location[loc_num], "http://")) { ACE_CString path; + ACE_CString arti_name; if (!this->resolve_http_reference (arti.location[loc_num], + arti_name, path)) { ACE_ERROR @@ -293,7 +295,7 @@ namespace CIAO } else { - arti.location[loc_num] = CORBA::string_dup (arti.name.in ()); + arti.location[loc_num] = arti_name.c_str (); //enque for cleanup } } @@ -460,6 +462,7 @@ is_shared_component (ACE_CString & name) bool CIAO::Containers_Info_Map::resolve_http_reference (const char* location, + ACE_CString &arti_name, ACE_CString &path) { @@ -491,6 +494,8 @@ is_shared_component (ACE_CString & name) } } + arti_name = name; + // Get the file. ACE_Message_Block* mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (0,0), false); @@ -511,7 +516,7 @@ is_shared_component (ACE_CString & name) return false; } - mb->release (); + mb->release (); return true; } diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index 076ee8a6511..4ef8ef289bc 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -104,6 +104,7 @@ namespace CIAO /// It returns true on success and false on failure bool resolve_http_reference (const char* location, + ACE_CString &arti_name, ACE_CString &name); /// function to retvieve a file via HTTP |