diff options
| author | arvindk <arvindk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-24 15:49:13 +0000 |
|---|---|---|
| committer | arvindk <arvindk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-24 15:49:13 +0000 |
| commit | ee04bd4e588a034ae151db99edde51a51ae72f0b (patch) | |
| tree | 1d2b4be5af9092e8ac55b56e69a9407493281d76 /TAO/CIAO | |
| parent | 68fce720fea7eed26dcea12e00730a8cd3371dd9 (diff) | |
| download | ATCD-ee04bd4e588a034ae151db99edde51a51ae72f0b.tar.gz | |
Sat Apr 24 10:46:14 2004 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/CIAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp | 17 | ||||
| -rw-r--r-- | TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h | 5 | ||||
| -rw-r--r-- | TAO/CIAO/DnC/Config_Handlers/PCD_Handler.cpp | 5 |
4 files changed, 20 insertions, 16 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 1ce0f98f1e6..c45b3124955 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Apr 24 10:46:14 2004 Arvind S. Krishna <arvindk@dre.vanderbilt.edu> + + * DnC/Config_Handler/PCD_Handler.cpp: + * DnC/Config_Handler/ERE_Handler.h: + * DnC/Config_Handler/ERE_Handler.cpp: + + Missed out on these handlers in my earlier commit. Made the same + changes as listed earlier for these handlers as well + Fri Apr 23 19:45:53 2004 Arvind S. Krishna <arvindk@dre.vanderbilt.edu> * DnC/Config_Handler/ADD_Handler.cpp: diff --git a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp index e6d2ce3f7e8..a329f8c60c1 100644 --- a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp +++ b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.cpp @@ -8,14 +8,11 @@ using CIAO::Config_Handler::Utils; -Deployment::ExternalReferenceEndpoint * -CIAO::Config_Handler::ERE_Handler::process_ExternalReferenceEndpoint (DOMNodeIterator * iter) +void +CIAO::Config_Handler::ERE_Handler:: +process_ExternalReferenceEndpoint (DOMNodeIterator * iter, + Deployment::ExternalReferenceEndpoint &ret_struct) { - Deployment::ExternalReferenceEndpoint_var ret_struct = 0; - ACE_NEW_THROW_EX (ret_struct, - Deployment::ExternalReferenceEndpoint, - CORBA::NO_MEMORY ()); - //Check if the Schema IDs for both the elements match DOMNode * node = iter->nextNode (); XStr name (node->getNodeName ()); @@ -29,11 +26,7 @@ CIAO::Config_Handler::ERE_Handler::process_ExternalReferenceEndpoint (DOMNodeIte } // Populate the structure - ret_struct->location = Utils::parse_string (iter); - - // Return structure - return ret_struct._retn (); - + ret_struct.location = Utils::parse_string (iter); } #endif /* ERE_HANDLER_C */ diff --git a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h index a3a0bcf5938..3fdafe87009 100644 --- a/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h +++ b/TAO/CIAO/DnC/Config_Handlers/ERE_Handler.h @@ -48,8 +48,9 @@ namespace CIAO class Config_Handler_Export ERE_Handler { public: - static Deployment::ExternalReferenceEndpoint * - process_ExternalReferenceEndpoint (DOMNodeIterator * iter); + static void + process_ExternalReferenceEndpoint (DOMNodeIterator * iter, + Deployment::ExternalReferenceEndpoint &ret_struct); // process <ExternalReferenceEndpoint> definitions in the descriptor // files diff --git a/TAO/CIAO/DnC/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/DnC/Config_Handlers/PCD_Handler.cpp index eb5792bb1b2..94612867038 100644 --- a/TAO/CIAO/DnC/Config_Handlers/PCD_Handler.cpp +++ b/TAO/CIAO/DnC/Config_Handlers/PCD_Handler.cpp @@ -118,8 +118,9 @@ namespace CIAO // fetch the ExternalReferenceEndpoint handler and // delegate to it // @@ need to avoid this copy, possible memory leak @@ - pcd.externalReference[i] = - *ERE_Handler::process_ExternalReferenceEndpoint (this->iter_); + // Arvind: Addressed the same. + ERE_Handler::process_ExternalReferenceEndpoint (this->iter_, + pcd.externalReference[i]); } else if (node_name == XStr (ACE_TEXT ("externalEndpoint"))) |