diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-06 10:12:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-06 10:12:38 +0000 |
| commit | c74a013bf5f34c74017b7b8694a91b8ff51b38d4 (patch) | |
| tree | b8a3a872ebd9409a163a97d6208fe6a7f5246e70 /TAO/orbsvcs/orbsvcs/FaultTolerance | |
| parent | d45d94467d8187dcb81b9f94c233314ef76b8d48 (diff) | |
| download | ATCD-c74a013bf5f34c74017b7b8694a91b8ff51b38d4.tar.gz | |
Sun Mar 6 10:07:28 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
* tao/Stub.h:
* tao/Stub.inl:
* tao/Stub.cpp:
Reworked simplication of the stub
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FaultTolerance')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index c889f4f1ffb..7b828bf738d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -197,7 +197,7 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt sc.context_id = IOP::FT_GROUP_VERSION; if (service_context.get_context (sc) == 0) - return false; /* false */ + return false; IOP::TaggedComponent tc; tc.tag = IOP::TAG_FT_GROUP; @@ -207,7 +207,7 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt if (stub->forward_profiles ()) { // set lock, as forward_profiles might be deleted concurrently - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, *stub->profile_lock (), 0)); @@ -228,9 +228,9 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt if (tagged_components.get_component (tc) == 0) // releasing lock - return false; /* false */ + return false; - return true; /* true */ + return true; // releasing lock } |