Wed Mar 2 19:22:23 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
        * tao/Stub.h:
        * tao/Stub.inl:
        * tao/Stub.cpp:
          Applied changes reverted on Mon Feb 14, didn't break the ImR example

1 files changed, 5 insertions, 8 deletions

diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 66bb2ed25ce..d0b11dd5509 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -116,10 +116,6 @@ public:
   void _incr_refcnt (void);
   void _decr_refcnt (void);
 
-  /// Return the Profile lock. This lock can be used at places where
-  /// profiles need to be edited.
-  ACE_Lock *profile_lock (void) const;
-
   /// Manage the base (non-forwarded) profiles.
   /// Returns a pointer to the profile_in_use object.  This object
   /// retains ownership of this profile.
@@ -265,6 +261,8 @@ public:
   void forwarded_on_exception (bool forwarded);
   bool forwarded_on_exception () const;
 
+  TAO_SYNCH_MUTEX& profile_lock () const;
+
 protected:
 
   /// Destructor is to be called only through _decr_refcnt() to
@@ -369,7 +367,7 @@ protected:
   TAO_Profile *profile_in_use_;
 
   /// Mutex to protect access to the forwarding profile.
-  ACE_Lock* profile_lock_ptr_;
+  mutable TAO_SYNCH_MUTEX profile_lock_;
 
   /// Have we successfully talked to the forward profile yet?
   CORBA::Boolean profile_success_;
@@ -403,9 +401,8 @@ protected:
    */
   CORBA::Boolean const collocation_opt_;
 
-
-  // True if forwarding request upon some specific exceptions
-  // (e.g. OBJECT_NOT_EXIST) already happened.
+  /// True if forwarding request upon some specific exceptions
+  /// (e.g. OBJECT_NOT_EXIST) already happened.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_;
 };