Mon Mar 16 15:12:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/Asynch_Reply_Dispatcher_Base.h:
        * tao/Fault_Tolerance_Service.h:
        * tao/IIOP_Acceptor.h:
        * tao/LF_Event_Binder.h:
        * tao/LF_Multi_Event.h:
        * tao/ObjectKey_Table.h:
        * tao/Policy_Validator.h:
        * tao/Profile_Transport_Resolver.h:
          Added private copy constructor/assignment operator to prevent
          making a copy which leads to a double delete

        * tao/Resume_Handle.inl:
          Check for self assignment

10 files changed, 52 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 43d78837470..7552bc783a2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon Mar 16 15:12:22 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Asynch_Reply_Dispatcher_Base.h:
+        * tao/Fault_Tolerance_Service.h:
+        * tao/IIOP_Acceptor.h:
+        * tao/LF_Event_Binder.h:
+        * tao/LF_Multi_Event.h:
+        * tao/ObjectKey_Table.h:
+        * tao/Policy_Validator.h:
+        * tao/Profile_Transport_Resolver.h:
+          Added private copy constructor/assignment operator to prevent
+          making a copy which leads to a double delete
+
+        * tao/Resume_Handle.inl:
+          Check for self assignment
+
 Mon Mar 16 14:58:22 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/DiffServ/run_test.pl
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
index fc955831b91..db12a2286a3 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -56,6 +56,10 @@ public:
   TAO_Service_Callbacks *service_callback (void);
 
 private:
+  void operator= (const TAO_Fault_Tolerance_Service &);
+  TAO_Fault_Tolerance_Service (const TAO_Fault_Tolerance_Service &);
+
+private:
 
   /// hook to callback on to the service
   TAO_Service_Callbacks *ft_service_callback_;
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 36119813bba..2cdceb4f300 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -213,6 +213,10 @@ protected:
                              CORBA::Short priority);
   //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
 
+private:
+  void operator= (const TAO_IIOP_Acceptor &);
+  TAO_IIOP_Acceptor (const TAO_IIOP_Acceptor &);
+
   //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START
 protected:
 
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index c2225fac1be..b8599ec1bcc 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -41,6 +41,10 @@ public:
   ~TAO_LF_Event_Binder (void);
 
 private:
+  void operator= (const TAO_LF_Event_Binder &);
+  TAO_LF_Event_Binder (const TAO_LF_Event_Binder &);
+
+private:
   /// Keep a reference to the leader follower
   TAO_LF_Event * const event_;
   TAO_LF_Follower * const follower_;
diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h
index 2a0a05fd9dd..f61909ba518 100644
--- a/TAO/tao/LF_Multi_Event.h
+++ b/TAO/tao/LF_Multi_Event.h
@@ -73,6 +73,10 @@ public:
   int error_detected (void) const;
 
   //@}
+private:
+  void operator= (const TAO_LF_Multi_Event &);
+  TAO_LF_Multi_Event (const TAO_LF_Multi_Event &);
+
 protected:
 
   /// Validate the state change
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
index 19713d2fd49..f18e9cf8600 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -71,9 +71,9 @@ public:
   virtual void connection_closed (void);
   virtual bool has_request (void);
 
-  private:
-    ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Muxed_TMS &))
-    ACE_UNIMPLEMENTED_FUNC (TAO_Muxed_TMS (const TAO_Muxed_TMS &))
+private:
+  void operator= (const TAO_Muxed_TMS &);
+  TAO_Muxed_TMS (const TAO_Muxed_TMS &);
 
 private:
   /// Lock to protect the state of the object
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index bea994c294a..4e2f8c13df4 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -122,6 +122,10 @@ namespace TAO
     int unbind_i (Refcounted_ObjectKey *&key);
 
   private:
+    void operator= (const ObjectKey_Table &);
+    ObjectKey_Table (const ObjectKey_Table &);
+
+  private:
 
     // Some useful typedefs.
     typedef ACE_RB_Tree<TAO::ObjectKey,
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index d91dd67a122..769e8e40de2 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -102,6 +102,10 @@ protected:
   TAO_ORB_Core &orb_core_;
 
 private:
+  void operator= (const TAO_Policy_Validator &);
+  TAO_Policy_Validator (const TAO_Policy_Validator &);
+
+private:
   TAO_Policy_Validator *next_;
 };
 
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 4ebf0f3edd6..9bf19631f8b 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -157,6 +157,9 @@ namespace TAO
     /// ORB.
     bool get_connection_timeout (ACE_Time_Value &max_wait_time);
 
+    void operator= (const Profile_Transport_Resolver &);
+    Profile_Transport_Resolver (const Profile_Transport_Resolver &);
+
   private:
     bool try_connect_i (TAO_Transport_Descriptor_Interface *desc,
                         ACE_Time_Value *val,
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index e89466fd4e2..04e538f537f 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -30,9 +30,12 @@ TAO_Resume_Handle::set_flag (TAO_Handle_Resume_Flag fl)
 ACE_INLINE TAO_Resume_Handle &
 TAO_Resume_Handle::operator= (const TAO_Resume_Handle &rhs)
 {
-  this->orb_core_ = rhs.orb_core_;
-  this->handle_ = rhs.handle_;
-  this->flag_ = rhs.flag_;
+  if (this != &rhs)
+    {
+      this->orb_core_ = rhs.orb_core_;
+      this->handle_ = rhs.handle_;
+      this->flag_ = rhs.flag_;
+    }
 
   return *this;
 }