ChangeLogTag: Thu May 4 08:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 30 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 915b9f4e261..79d587d8741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu May  4 08:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted the change below, broke the sendfile test and Steve
+        Huston changed things in such a way that sendfile is only
+        used on Solaris 9 and newer
+
+        Tue May  2 09:34:54 Pacific Daylight Time 2006    <ossama_othman at symantec dot com>
+        * ace/OS_NS_sys_sendfile.inl (sendfile):
+          Removed "::" global scope qualifier from platform sendfile()
+          call.  It caused problem on Solaris 8.  Thanks to Simon Massey
+          and Johnny Willemsen for analyzing the problem and suggesting
+          this fix.
+
 Thu May  4 08:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ace_for_tao.mpc:
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index d11d48b1d2e..d2af5d9a2e5 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -52,20 +52,23 @@ TAO_ClientRequestInfo::setup_picurrent (void)
       // Retrieve the thread scope current.
       TAO::PICurrent_Impl *tsc = pi_current->tsc ();
 
-      // Logically copy the TSC's slot table to the RSC.
-      this->rs_pi_current_.lc_slot_table (tsc);
-
-      // PICurrent will potentially have to call back on the request
-      // scope current so that it can deep copy the contents of the
-      // thread scope current if the contents of the thread scope
-      // current are about to be modified.  It is necessary to do this
-      // deep copy once in order to completely isolate the request
-      // scope current from the thread scope current.  This is only
-      // necessary, if the thread scope current is modified after its
-      // contents have been *logically* copied to the request scope
-      // current.
-      this->copy_callback_.src_and_dst (tsc, &this->rs_pi_current_);
-      tsc->copy_callback (&this->copy_callback_);
+      if (tsc != 0)
+        {
+          // Logically copy the TSC's slot table to the RSC.
+          this->rs_pi_current_.lc_slot_table (tsc);
+
+          // PICurrent will potentially have to call back on the request
+          // scope current so that it can deep copy the contents of the
+          // thread scope current if the contents of the thread scope
+          // current are about to be modified.  It is necessary to do this
+          // deep copy once in order to completely isolate the request
+          // scope current from the thread scope current.  This is only
+          // necessary, if the thread scope current is modified after its
+          // contents have been *logically* copied to the request scope
+          // current.
+          this->copy_callback_.src_and_dst (tsc, &this->rs_pi_current_);
+          tsc->copy_callback (&this->copy_callback_);
+       }
     }
 }