ChangeLogTag:Mon Jul 22 13:49:28 2002 Carlos O'Ryan <coryan@atdesk.com>

5 files changed, 33 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2b6f560a92c..d483d53cda5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Jul 22 13:49:28 2002  Carlos O'Ryan  <coryan@atdesk.com>
+
+	* tao/Utils/RIR_Narrow.h:
+	  Removed syntax error.
+
+	* tao/Utils/RIR_Narrow.cpp:
+	  Removed bogus semi-colon.
+
+	* examples/Makefile:
+	  Add AMH directory, without this the nightly regression tests fail.
+
+	* tests/AMH_Exceptions/client.cpp:
+	  This test expects an exception from the server, in fact, the
+	  whole point of the test is to verify that exceptions do work
+	  with AMH.  Thus, the client should not print an error when the
+	  exception is raised, rather, it should print an error when the
+	  exception is *NOT* raised.
+
 Mon Jul 22 12:15:24 2002  Krishnakumar B  <kitty@cs.wustl.edu>
 
         * taoconfig.mk (INCLDIRS):
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index 8abeff5a8f1..8ce3197df6a 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -19,6 +19,7 @@ DIRS  = Callback_Quoter \
         Load_Balancing \
 	Persistent_Grid \
 	AMI \
+	AMH \
 	Quoter \
 	Load_Balancing_persistent \
 	Simulator \
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 370f7540d6a..1260704beea 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -42,7 +42,7 @@ TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
 
 template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
-                                          ACE_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL)
 {
   _var_type narrowed_object = T::_narrow (object
                                           ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index c8d42506532..9793cb3e7c9 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -33,8 +33,6 @@ public:
   static _ptr_type narrow (CORBA::ORB_ptr orb,
                            char const * id
                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-                           ACE_ENV_ARG_
-
 
   /// Use resolve_initial_references to find an object and then
   /// narrow it.
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index b8f254e620e..3957443f9cc 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -1,10 +1,5 @@
 // $Id$
 
-#include "ace/pre.h"
-
-//#include "ace/Sched_Params.h"
-//#include "tao/Strategies/advanced_resource.h"
-
 #include "TestC.h"
 
 const char *ior = "file://test.ior";
@@ -12,6 +7,7 @@ const char *ior = "file://test.ior";
 int
 main (int argc, char *argv[])
 {
+  int received_expected_exception = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -38,6 +34,11 @@ main (int argc, char *argv[])
       roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
+  ACE_CATCH(Test::ServerOverload, ov)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
+      received_expected_exception = 1;
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
@@ -45,5 +46,12 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
+  if(!received_expected_exception)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "ERROR, expecting a ServerOverload exception!!\n"),
+                        1);
+    }
+
   return 0;
 }