Fri May 17 13:42:24 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

3 files changed, 34 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6b794b98b6b..1f3bbc097e0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri May 17 13:42:24 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/libraries.html:
+
+          Add descrption of libTAO_Async_IORTable.so
+
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+
+          Fix for problem that surfaces when a CSD implementation is used along with
+          server-side portable interceptors.
+
 Fri May 17 13:40:00 UTC 2013  Simon Massey  <simon dot massey at prismtech dot com>
 
         * NEWS:
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index 7c03e93e967..49c064acce1 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -66,6 +66,16 @@ and the dependencies outlined below are the same. <P>
    <td>anytypecode.mpb</td>
    </tr>
    <tr align=left>
+   <th>libTAO_Async_IORTable.so</th>
+   <td>See libTAO_IORTable.so below for more info. This is a specialization
+    of the TAO_IORTable that allows for AMH-compatible locator use when
+    resolving CORBALOC references. See the INS_Locator portion of the
+    TAO Implementation Repository as an example of use.  Applications
+    have to <code> #include "tao/IORTable/Async_IORTable.h" </code> to get
+    the right symbols.</td>
+   <td>iortable.mpb</td>
+   </tr>
+   <tr align=left>
    <th>libTAO_BiDirGIOP.so</th>
    <td>Support for BiDirectional GIOP as outlined by the CORBA
     spec. Please see $TAO_ROOT/tests/BiDirectional for a simple
@@ -99,6 +109,13 @@ and the dependencies outlined below are the same. <P>
    <td>dynamicany.mpb</td>
    </tr>
    <tr align=left>
+   <th>libTAO_DynamicInterface.so</th>
+   <td>Support for DII and DSI invocations. Applications have to
+    <code> #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
+    </code> to get the right symbols.</td>
+   <td>dynamicinterface.mpb</td>
+   </tr>
+   <tr align=left>
    <th>libTAO_EndpointPolicy.so</th>
    <td>Support for the TAO-specific Endpoint Policy. This is used
     to set up constraints on endpoints placed in IORs. The endpoint
@@ -110,13 +127,6 @@ and the dependencies outlined below are the same. <P>
    <td>endpointpolicy.mpb</td>
    </tr>
    <tr align=left>
-   <th>libTAO_DynamicInterface.so</th>
-   <td>Support for DII and DSI invocations. Applications have to
-    <code> #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
-    </code> to get the right symbols.</td>
-   <td>dynamicinterface.mpb</td>
-   </tr>
-   <tr align=left>
    <th>libTAO_IFR_Client.so</th>
    <td>Support for client/stub side interfaces for
     InterfaceRepository applications. Applications have to <code>
@@ -274,9 +284,9 @@ and the dependencies outlined below are the same. <P>
    </tr>
    <tr align=left>
    <th>libTAO_TC.so</th>
-   <td>Support for TAO::Transport::Current - a generic fremework for aplications that 
-   need access to statistical information about the currently used Transport. See <a 
-   href="transport_current/index.html"> Transport::Current</a>. 
+   <td>Support for TAO::Transport::Current - a generic fremework for aplications that
+   need access to statistical information about the currently used Transport. See <a
+   href="transport_current/index.html"> Transport::Current</a>.
    This library can be loaded statically or dynamically. Applications are required to
     <code> #include "tao/TransportCurrent/Transport_Current.h"
     </code> for static loading.
@@ -285,9 +295,9 @@ and the dependencies outlined below are the same. <P>
    </tr>
    <tr align=left>
    <th>libTAO_TC_IIOP.so</th>
-   <td>Support for TAO::Transport::IIOP::Current - an IIOP-specific plug-in for 
+   <td>Support for TAO::Transport::IIOP::Current - an IIOP-specific plug-in for
    Transport::Current. See <a href="transport_current/index.html"> Transport::Current</a>.
-   This library can be loaded statically or dynamically. 
+   This library can be loaded statically or dynamically.
    Applications are required to <code> #include "tao/TransportCurrent/IIOP_Transport_Current.h"
     </code> for static loading. Depends on libTAO_TC.so.
    </td>
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 24cbb88ca02..467473244de 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -267,9 +267,7 @@ TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request)
   //#if TAO_HAS_INTERCEPTORS == 1
   // TYPE: size_t
   // ACTION: Primitive data type assignment.
-  //         Just leave this alone for a clone.
-  //
-  //clone_obj->interceptor_count_ = request->interceptor_count_;
+  clone_obj->interceptor_count_ = request->interceptor_count_;
 
   // TYPE: TAO::PICurrent_Impl
   // ACTION: Copy/assignment operator disabled on purpose.