Mon Feb 14 10:44:30 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
        * tao/Client_Strategy_Factory.h:
        * tao/Client_Strategy_Factory.cpp:
        * tao/Configurable_Refcount.h:
        * tao/Configurable_Refcount.inl:
        * tao/Configurable_Refcount.cpp:
        * tao/IORTable/Table_Adapter.h:
        * tao/IORTable/Table_Adapter.cpp:
        * tao/Messaging/AMH_Response_Handler.cpp:
        * tao/ORB_Core.h:
        * tao/ORB_Core.cpp:
        * tao/Object.h:
        * tao/Object.inl:
        * tao/Object.cpp:
        * tao/ObjectKey_Table.h:
        * tao/ObjectKey_Table.cpp:
        * tao/On_Demand_Fragmentation_Strategy.h:
        * tao/PortableServer/Non_Servant_Upcall.cpp:
        * tao/PortableServer/Object_Adapter.h:
        * tao/PortableServer/Object_Adapter.inl:
        * tao/PortableServer/Object_Adapter.cpp:
        * tao/PortableServer/Root_POA.h:
        * tao/PortableServer/Root_POA.inl:
        * tao/PortableServer/Root_POA.cpp:
        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
        * tao/PortableServer/Servant_Upcall.cpp:
        * tao/Profile.h:
        * tao/Profile.inl:
        * tao/Profile.cpp:
        * tao/Refcounted_ObjectKey.inl:
        * tao/Refcounted_ObjectKey.cpp:
        * tao/Resource_Factory.h:
        * tao/Resource_Factory.cpp:
        * tao/Server_Strategy_Factory.h:
        * tao/Server_Strategy_Factory.cpp:
        * tao/Stub.h:
        * tao/Stub.inl:
        * tao/Stub.cpp:
        * tao/Transport_Mux_Strategy.h:
        * tao/Valuetype/AbstractBase.h:
        * tao/Valuetype/AbstractBase.cpp:
        * tao/default_client.h:
        * tao/default_client.cpp:
        * tao/default_resource.h:
        * tao/default_resource.cpp:
        * tao/default_server.h:
        * tao/default_server.cpp:
        * tao/tao.mpc:
        * tao/ObjectKey_Table.inl:
          Reverted the changes to TAO/tao from the commit of last friday.
          The ImR example Combined_Service broke and I am not in the position
          to analyze the exact failure at this moment. Will reapply the
          changes asap when I have time to analyze this

1 files changed, 13 insertions, 9 deletions

diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index aa654b4464b..4e2f8c13df4 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -21,7 +21,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Null_Mutex.h"
-#include "ace/Copy_Disabled.h"
 
 #include "tao/Object_KeyC.h"
 #include /**/ "tao/Versioned_Namespace.h"
@@ -76,7 +75,7 @@ namespace TAO
    * @note This class uses the ACE_RB_Tree to maintain the table of
    * ObjectKeys. The RB_Tree has good insertion and lookup
    * properties. Its Iteration properties are not that good, but we
-   * don't need to do much iteration unless we are closing down the
+   * dont need to do much iteration unless we are closing down the
    * table.
    *
    * @note The reasons to use RB_Tree are its good dynamic
@@ -86,7 +85,7 @@ namespace TAO
    * will do that if our instrumentation shows the need for it.
    *
    */
-  class TAO_Export ObjectKey_Table : private ACE_Copy_Disabled
+  class TAO_Export ObjectKey_Table
   {
   public:
     /// Default Constructor and destructor..
@@ -94,6 +93,10 @@ namespace TAO
 
     ~ObjectKey_Table (void);
 
+    /// Initialize method that sets up the underlying lock and other
+    /// related stuff.
+    int init (TAO_ORB_Core *orb);
+
     /// Iterates and unbinds the contents of the table.
     int destroy (void);
 
@@ -119,14 +122,19 @@ namespace TAO
     int unbind_i (Refcounted_ObjectKey *&key);
 
   private:
-    /// Some useful typedefs.
+    void operator= (const ObjectKey_Table &);
+    ObjectKey_Table (const ObjectKey_Table &);
+
+  private:
+
+    // Some useful typedefs.
     typedef ACE_RB_Tree<TAO::ObjectKey,
                         TAO::Refcounted_ObjectKey *,
                         TAO::Less_Than_ObjectKey,
                         ACE_Null_Mutex> TABLE;
 
     /// Lock for the table.
-    TAO_SYNCH_MUTEX lock_;
+    ACE_Lock *lock_;
 
     /// Table that contains the data
     TABLE table_;
@@ -135,10 +143,6 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-# include "tao/ObjectKey_Table.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /*TAO_OBJECT_KEY_TABLE_H*/