diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-06 22:20:11 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-06 22:20:11 +0000 |
| commit | c743f057a34aa4dbfd0991db8612ac9e91e0be30 (patch) | |
| tree | 8d33c919c1b952608aa0cfffa80993e4fcc3eb1c | |
| parent | 0d5d2849edc27641810d3e6a180fa30890c0b5d6 (diff) | |
| download | ATCD-c743f057a34aa4dbfd0991db8612ac9e91e0be30.tar.gz | |
ChangeLogTag:Mon Oct 6 17:18:30 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
4 files changed, 23 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 50b7261b556..2e94027a7ca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Oct 6 17:18:30 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp: + + Improper copy from the main trunk here. + + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: + + Fixed a wrong delete that cuased the ORB to crash. + Thu Oct 2 15:12:50 2003 Steve Totten <totten_s@ociweb.com> * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index b1e8a7504c0..e63433369ca 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -17,10 +17,15 @@ namespace TAO { FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void) : name_ ("TAO_FT_ClientRequest_Interceptor") - , uuid_ (ACE_Utils::UUID_GENERATOR::instance ()->generateUUID ()) + , uuid_ (0) , lock_ (0) , retention_id_ (0) { + ACE_Utils::UUID_GENERATOR::instance ()->init (); + + this->uuid_ = + ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (); + // Would be nice to have runtime option. ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_SYNCH_MUTEX>); @@ -45,12 +50,10 @@ namespace TAO return CORBA::string_dup (this->name_); } - void FT_ClientRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - delete this; } void @@ -96,7 +99,7 @@ namespace TAO ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->tss_resources ()->clean_flag_ = false; + this->tss_resources ()->clean_flag_ = true; } void @@ -317,8 +320,13 @@ namespace TAO *this->lock_); ftrsc.retention_id = ++this->retention_id_; + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Retention id [%d]\n", + ftrsc.retention_id)); tss->retention_id_ = ftrsc.retention_id; - } + tss->clean_flag_ = false; + } else { ftrsc.retention_id = diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 0a14614abf1..a82900b78ef 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -34,7 +34,6 @@ namespace TAO FT_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - delete this; } void diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index a29361fdb85..f64ad373bb9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -5,7 +5,6 @@ #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "ace/Dynamic_Service.h" -#include <iostream> ACE_RCSID(FaultTolerance, FT_Service_Activate, "$Id$") |