1 files changed, 22 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b8f0b2a4d1f..c3a83efba4c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  * @file FT_Service_Callbacks.h
@@ -16,7 +14,7 @@
 #define TAO_FT_CALLBACKS_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +23,6 @@
 #include "tao/Service_Callbacks.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Profile;
 class TAO_MProfile;
 class TAO_ORB_Core;
@@ -61,13 +57,6 @@ public:
   virtual CORBA::ULong hash_ft (TAO_Profile *p,
                                 CORBA::ULong m);
 
-
-  /// Verify condition for  permanent forward is given,
-  /// both parameters must provide group attributes.
-  virtual CORBA::Boolean is_permanent_forward_condition
-  (const CORBA::Object_ptr obj,
-   const TAO_Service_Context &service_context) const;
-
   /// Check whether we need to raise an exception or go for a
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_comm_failure (
@@ -82,8 +71,6 @@ public:
       TAO_Profile *profile
       ACE_ENV_ARG_DECL);
 
-  static TimeBase::TimeT now (void);
-
 private:
 
   /// Check whether the right flags are available so that we can issue a
@@ -98,10 +85,28 @@ private:
   /// Mutex to protect access to the profile that gets passed along
   /// @@ Lock needs to be removed...
   ACE_Lock* profile_lock_;
-};
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+  /**
+   * A flag that indicates that the primary has already failed. So any
+   * more calls to select_profile () should not reset the profile
+   * pointer to the primary.
+   */
+  CORBA::Boolean primary_failed_;
+
+  /**
+   * A flag to indicate that a secondary has been selected for
+   * invocation. We do this only once in the cycle. When we get there
+   * again we dont select a primary again and again.
+   */
+  CORBA::Boolean secondary_set_;
+
+  /// FT group component in the IOGR
+  FT::TagFTGroupTaggedComponent group_component_;
+
+  /// A flag to indicate whether we have extracted the
+  /// <group_component> before.
+  CORBA::Boolean group_component_flag_;
+};
 
 #include /**/ "ace/post.h"
-
 #endif /*TAO_FT_CALLBACKS_H*/