diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-07 09:15:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-07 09:15:25 +0000 |
| commit | 2fc70c1eb9f6748fa62af32227374baa0ff54997 (patch) | |
| tree | 980a8913809a35d0c29ce9d1cc21fee9ee1447b4 /TAO/orbsvcs | |
| parent | 71fab242995b8ffbece53eaa619776543fd73171 (diff) | |
| download | ATCD-2fc70c1eb9f6748fa62af32227374baa0ff54997.tar.gz | |
Mon Mar 7 09:10:25 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
* tao/Stub.h:
* tao/Stub.inl:
* tao/Stub.cpp:
ImR example again broke, need to sort this out later
Diffstat (limited to 'TAO/orbsvcs')
| -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 7b828bf738d..c889f4f1ffb 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; + return false; /* 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 (TAO_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 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; + return false; /* false */ - return true; + return true; /* true */ // releasing lock } |