diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-08-23 18:46:15 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-08-23 18:46:15 +0000 |
| commit | 37d52ebbde9b350c7574031de51983b9c0d4b92e (patch) | |
| tree | 7b40f53db2e87f9d61806ea87e4615b6d5f9cd76 | |
| parent | 987459faaa53e129c379df3b50979f99847391eb (diff) | |
| download | ATCD-37d52ebbde9b350c7574031de51983b9c0d4b92e.tar.gz | |
ChangeLogTag:Wed
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aff629d90bd..91d816d936a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 23 18:41:15 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl: Reverted changes + to see if that fixes the RTEC Mcast problems. + Wed Aug 23 17:43:29 UTC 2006 Yan Dai <dai_y@ociweb.com> * tao\PortableServer\DII_Arguments_Converter.h: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 6bf6099074d..d5e98c5d91b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -393,7 +393,7 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from, -1); } - *request = 0; + *request = &Request_Completed_; return 1; } @@ -477,7 +477,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( return -1; delete *request; - *request = 0; + *request = &Request_Completed_; return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl index 9cdeeee5f5a..5ae92077627 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) - : request_id_generator_ (ACE_OS::time (0)), + : // request_id_generator_ (ACE_OS::time (0)), port_number_ (0), if_count_ (0), ifs_ (0) @@ -17,6 +17,9 @@ TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) ACE_INLINE TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoint& rhs) + : port_number_ (0), + if_count_ (0), + ifs_ (0) { // This assignment operator does all the work needed to initialize // this object in the copy constructor. |