ChangeLogTag:Wed Nov 8 10:00:16 2000 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 61 insertions, 75 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 224ab944967..b7769a3c3e6 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,29 +1,40 @@
+Wed Nov  8 10:00:16 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/IDL_Test/Makefile:
+          I think I finally nailed the dependencies for the magic IDL
+          files in this directory.  At least it compiles correctly in our
+          4-way box, where it used to fail all the time.
+
+        * tests/Portable_Interceptors/Dynamic/interceptors.cpp:
+          Fixed warnings about unused variables, also fixed a couple of
+          memory leaks, and unchecked exceptions.
+
 Wed Nov  8 11:44:58 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* orbsvcs/IFR_Service/TCF_Loader.cpp:
+        * orbsvcs/IFR_Service/TCF_Loader.cpp:
 
-	  Removed unused args from create_object method.
+          Removed unused args from create_object method.
 
-	* orbsvcs/IFR_Service/TypeCodeFactoryC.cpp:
+        * orbsvcs/IFR_Service/TypeCodeFactoryC.cpp:
 
-	  Added missing 'CORBA_' to constructor and destructor
-	  declarations.
+          Added missing 'CORBA_' to constructor and destructor
+          declarations.
 
 Wed Nov  8 06:48:08 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* tests/RTCORBA/README: Updated the information to point to
-	  the appropriate documentation.  Thanks to Michael Hampel
- 	  <michael.hampel@fhs-hagenberg.ac.at> for motivating this.
+        * tests/RTCORBA/README: Updated the information to point to
+          the appropriate documentation.  Thanks to Michael Hampel
+          <michael.hampel@fhs-hagenberg.ac.at> for motivating this.
 
 Tue Nov  7 21:46:57 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* TAO_IDL/ast/ast_type.cpp:
-	* TAO_IDL/include/ast_type.h:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/include/ast_type.h:
 
-	  Added flag to indicate whether the node has been added
-	  to the Interface Repository. Used for types that can
-	  be forward declared, which right now is only interfaces,
-	  but will eventually include other types as well.
+          Added flag to indicate whether the node has been added
+          to the Interface Repository. Used for types that can
+          be forward declared, which right now is only interfaces,
+          but will eventually include other types as well.
 
 Tue Nov 07 16:38:05 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile
index 23bcc3cff88..705d29aad21 100644
--- a/TAO/tests/IDL_Test/Makefile
+++ b/TAO/tests/IDL_Test/Makefile
@@ -79,15 +79,15 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 .PRECIOUS: $(foreach file, $(IDL_SRC), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
-namespace_check.cpp: reopened_modulesC.cpp reopen_include1C.cpp reopen_include2C.cpp
+namespace_check.cpp: reopened_modulesC.h reopen_include1C.h reopen_include2C.h
 
-reopened_modulesC.cpp: reopened_modules.idl $(TAO_ROOT)/TAO_IDL/tao_idl
+reopened_modulesC.h: reopened_modules.idl $(TAO_ROOT)/TAO_IDL/tao_idl
 	$(TAO_ROOT)/TAO_IDL/tao_idl -w -Ge 1 reopened_modules.idl
 
-reopen_include1C.cpp: reopen_include1.idl $(TAO_ROOT)/TAO_IDL/tao_idl
+reopen_include1C.h: reopen_include1.idl $(TAO_ROOT)/TAO_IDL/tao_idl
 	$(TAO_ROOT)/TAO_IDL/tao_idl -w -Ge 1 reopen_include1.idl
 
-reopen_include2C.cpp: reopen_include2.idl $(TAO_ROOT)/TAO_IDL/tao_idl
+reopen_include2C.h: reopen_include2.idl $(TAO_ROOT)/TAO_IDL/tao_idl
 	$(TAO_ROOT)/TAO_IDL/tao_idl -w -Ge 1 reopen_include2.idl
 
 main:	$(addprefix $(VDIR),$(TEST_OBJS))
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
index bc71c367ec7..32e23f423a9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
@@ -130,42 +130,25 @@ Echo_Client_Request_Interceptor::receive_exception (
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
+  CORBA::String_var operation =
+    rinfo->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
               "from \"%s\"\n",
-              rinfo->operation (TAO_ENV_SINGLE_ARG_PARAMETER)));
+              operation.in ()));
+
+
+  CORBA::String_var exception_id =
+    rinfo->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  // As of now, there is no way to extract an exception from an Any in TAO.
-
-  /*  CORBA::Any excp = *(ri->received_exception ());
-  CORBA::Exception *e;
-  excp >>= *e;*/
-
-  TAO_ClientRequestInfo *ri
-    =  ACE_reinterpret_cast (TAO_ClientRequestInfo *,
-                             rinfo->_tao_QueryInterface
-                             (
-                              ACE_reinterpret_cast
-                              (
-                               ptr_arith_t,
-                               &PortableInterceptor::ClientRequestInfo::_narrow
-                               )
-                              )
-                             );
-
-  CORBA::Exception *e = ri->_received_exception ();
-
-//   if (ACE_OS::strcmp (ri->received_exception_id (), e->_id ())== 0)
-//     ACE_DEBUG ((LM_DEBUG,
-//                 "Exception ID = %s\n", e->_id ()));
-
-//   ACE_DEBUG ((LM_DEBUG,
-//               ACE_TEXT ("%s\n"),
-//               e->_info ().c_str ()));
+  ACE_DEBUG ((LM_DEBUG,
+              "Exception ID = %s\n",
+              exception_id.in ()));
 }
 
-
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
   : myname_ ("Echo_Server_Interceptor")
 {
@@ -267,36 +250,28 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
+  CORBA::String_var operation =
+    rinfo->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::send_exception from \"%s\"\n",
-              rinfo->operation ()));
-  // As of now, there is no way to extract an exception from an Any in TAO.
-  /*
-  CORBA::Any excp = *(ri->sending_exception ());
-  CORBA::Exception *e;
-  excp >>= *e;
-  */
-
-  TAO_ServerRequestInfo *ri
-    =  ACE_reinterpret_cast (TAO_ServerRequestInfo *,
-                             rinfo->_tao_QueryInterface
-                             (
-                              ACE_reinterpret_cast
-                              (
-                               ptr_arith_t,
-                               &PortableInterceptor::ServerRequestInfo::_narrow
-                               )
-                              )
-                             );
-
-  CORBA::Exception *e = ri->_sending_exception ();
-//   ACE_DEBUG ((LM_DEBUG,
-//               "Exception ID = %s\n", e->_id ()));
-
-//   ACE_DEBUG ((LM_DEBUG,
-//               ACE_TEXT ("%s\n"),
-//               e->_info ().c_str ()));
+              "Echo_Client_Request_Interceptor::received_exception "
+              "from \"%s\"\n",
+              operation.in ()));
+
+
+  CORBA::Any_var any =
+    rinfo->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
+  CORBA::TypeCode_var type = any->type ();
+
+  const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "Exception ID = %s\n",
+              exception_id));
 }
 
 void