ChangeLogTag: Sat Nov 2 19:58:51 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

10 files changed, 71 insertions, 38 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6b39070c79e..36fc57cac93 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Sat Nov  2 19:58:51 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tests/Bug_1269_Regression/ORB_Task.cpp:
+	* tests/Bug_1269_Regression/Server_Timer.cpp:
+	* tests/Bug_1269_Regression/client.cpp:
+	* tests/Bug_1269_Regression/shutdown.cpp:
+	* tests/Bug_1270_Regression/ORB_Task.cpp:
+	* tests/Bug_1270_Regression/Server_Timer.cpp:
+	* tests/Bug_1270_Regression/client.cpp:
+	* tests/Bug_1270_Regression/shutdown.cpp: Fixed compile errors on
+	  platforms where exceptions have been disabled. 
+	
+	* tests/Bug_1270_Regression/run_test.pl:
+	* tests/Bug_1269_Regression/run_test.pl: Changed the cutoff times
+	  so that the tests would run without displaying errors on my
+	  box. I would love these tests to run in our daily builds. But we
+	  cannot run these, since they run for more than 75 mins on my two
+	  processor box! 
+
 Sat Nov 02 20:46:08 2002  Pradeep Gore  <pradeep@oomworks.com>
 
 	* orbsvcs/orbsvcs/CosNotification.bor:
diff --git a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
index 7901b9eccdb..35fca1ebc30 100644
--- a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
@@ -24,7 +24,7 @@ ORB_Task::svc (void)
       this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH(CORBA::Exception const, ex)
+  ACE_CATCH(CORBA::Exception, ex)
     {
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
index 62a493c18fe..858ef4d973c 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
@@ -28,17 +28,23 @@ Server_Timer::activate (void)
 int
 Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  Test::Payload pload(1024);
+  pload.length(1024);
 
-  Test::Payload pload(1024); pload.length(1024);
   ACE_OS::memset(pload.get_buffer(), pload.length(), 0);
+
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
-    Test::Echo_var echo = Test::Echo::_duplicate(this->echo_.in());
-    if(CORBA::is_nil(echo.in()))
+    Test::Echo_var echo =
+      Test::Echo::_duplicate (this->echo_.in());
+
+    if(CORBA::is_nil (echo.in()))
       return 0;
 
-    echo->echo_payload(pload);
+    echo->echo_payload (pload
+                        ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
     ACE_Time_Value tv (0, 20000);
     this->reactor()->schedule_timer (this, 0, tv);
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index c3bf56a5589..8b57a413c66 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -118,7 +118,8 @@ main (int argc, char *argv[])
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run(ACE_ENV_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
diff --git a/TAO/tests/Bug_1269_Regression/run_test.pl b/TAO/tests/Bug_1269_Regression/run_test.pl
index 0adb00f43e4..6c2670ffd4f 100755
--- a/TAO/tests/Bug_1269_Regression/run_test.pl
+++ b/TAO/tests/Bug_1269_Regression/run_test.pl
@@ -36,9 +36,9 @@ while($elapsed < $max_running_time) {
 
   # ... wait for the clients to die unless they did not startup,
   # ignore errors because they intentionally crash themselves!
-  $CL3->WaitKill(30) unless $client3 < 0;
-  $CL2->WaitKill(30) unless $client2 < 0;
-  $CL1->WaitKill(30) unless $client1 < 0;
+  $CL3->WaitKill(45) unless $client3 < 0;
+  $CL2->WaitKill(45) unless $client2 < 0;
+  $CL1->WaitKill(45) unless $client1 < 0;
 
   $elapsed = time() - $start_time;
 }
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index a6d0fd89fda..e48142df37f 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -24,13 +24,13 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        Test::Echo_Caller::_narrow (tmp.in ()
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown(ACE_ENV_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
index 6a1adb17c9c..1b6ceb98525 100644
--- a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
@@ -10,8 +10,8 @@
 
 ACE_RCSID(Bug_1270_Regression, ORB_Task, "$Id$")
 
-ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
-  : orb_(CORBA::ORB::_duplicate(orb))
+ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -21,10 +21,10 @@ ORB_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH(CORBA::Exception const, ex)
+  ACE_CATCH (CORBA::Exception, ex)
     {
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
index 0d5ad1bb3e5..f9a0fb57173 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -31,25 +31,31 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 {
   refcnt_++;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  Test::Payload pload (1024);
+  pload.length (1024);
+
+  ACE_OS::memset (pload.get_buffer(), pload.length(), 0);
 
-  Test::Payload pload(1024); pload.length(1024);
-  ACE_OS::memset(pload.get_buffer(), pload.length(), 0);
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    Test::Echo_var echo = Test::Echo::_duplicate(this->echo_.in());
-    if(CORBA::is_nil(echo.in()))
-      return 0;
+    {
+      Test::Echo_var echo =
+        Test::Echo::_duplicate (this->echo_.in ());
+
+      if(CORBA::is_nil (echo.in ()))
+        return 0;
 
-    echo->echo_payload(pload);
-  }
+      echo->echo_payload (pload
+                          ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
   ACE_CATCHANY
-  {
-    this->echo_ = Test::Echo::_nil ();
+    {
+      this->echo_ = Test::Echo::_nil ();
 
-    if(this->reactor()->cancel_timer(this) != 0)
-      refcnt_--;
-  }
+      if (this->reactor ()->cancel_timer (this) != 0)
+        refcnt_--;
+    }
   ACE_ENDTRY;
 
   refcnt_--;
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 1df4d9a527b..ef8cb487861 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -118,7 +118,8 @@ main (int argc, char *argv[])
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run(ACE_ENV_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 5045dfbfb72..68026a71eec 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -24,13 +24,13 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Echo_Caller_var server =
         Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown(ACE_ENV_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);