ChangeLogTag:Mon Feb 5 19:41:41 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 25 insertions, 8 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index b8c38edf873..224ea9a6a3c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Mon Feb  5 19:41:41 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/ORB_Core.h (object_ref_table):
+
+	  Clarified the comment corresponding to this method.  It should
+	  be apparent what the returned table is used for.
+
+	* tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp (receive_request_service_contexts):
+
+	  Ignore the "_is_a" operation since it may have been invoked
+	  locally on the server side as a side effect of another call,
+	  meaning that the client hasn't added the service context yet.
+	  Fixes a test failure.
+
 Mon Feb  5 16:48:10 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * orbsvcs/IFR_Service/IFR_Service.cpp:
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 27a3204c77c..163294e9e17 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -862,13 +862,10 @@ public:
   void bidir_giop_policy (CORBA::Boolean);
 
 
-  /**
-   * Return the table that maps object key/name to de-stringified
-   * object reference.  The contents of this table do not correspond
-   * to the contents of any other similar table, such as the table
-   * that maps object key/name to stringified object reference.  It is
-   * a completely independent table.
-   */
+
+  /// Return the table that maps object key/name to de-stringified
+  /// object reference.  It is needed for supporting local objects in
+  /// the resolve_initial_references() mechanism.
   TAO_Object_Ref_Table &object_ref_table (void);
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index 7491cc8955c..add486026f7 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -243,9 +243,15 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::"
               "receive_request_service_contexts from "
-              "\"%s\"",
+              "\"%s\"\n",
               operation.in ()));
 
+  // Ignore the "_is_a" operation since it may have been invoked
+  // locally on the server side as a side effect of another call,
+  // meaning that the client hasn't added the service context yet.
+  if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0)
+    return;
+
   IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
     ri->get_request_service_context (id, ACE_TRY_ENV);