ChangeLogTag: Thu May 22 11:43:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 17 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5dbf99ccfef..c0e5f8be4bd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 22 11:43:44 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1361_Regression/Echo.cpp:
+        * tests/Bug_1361_Regression/client.cpp:
+
+          Reverted changes to this test.  It caused issues with VxWorks.
+
 Wed May 21 19:02:38 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Makefile.am:
@@ -18,7 +25,7 @@ Wed May 21 15:52:17 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
         * orbsvcs/orbsvcs/Notify/MonitorControl/Generic.cpp:
         * orbsvcs/orbsvcs/Notify/MonitorControl/Generic.h:
 
-          Removed these files, using the base registry and monitor 
+          Removed these files, using the base registry and monitor
           classes in ACE instead.
 
         * MPC/config/notification_mc.mpb:
@@ -27,7 +34,7 @@ Wed May 21 15:52:17 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMC.idl:
 
-          Added include of $TAO_ROOT/tao/Monitor.idl and used the 
+          Added include of $TAO_ROOT/tao/Monitor.idl and used the
           indirectly included StringSeq type for NameList, instead of
           declaring a new typedef. These changes are the start of
           the integration of the new ACE and TAO monitor and control
@@ -76,7 +83,7 @@ Tue May 20 19:37:31 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Transport_Cache_Manager.cpp:
         * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        
+
           Added the ORB's string name to the name of the connection
           cache size monitor, connection cache purge monitor, and
           the Active Object Map size monitor, since some tests were
@@ -111,13 +118,13 @@ Tue May 20 18:05:08 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
           Briefly: the change involves adding the transport to the
           cache at the time the connection is initiated rather than
           waiting until the connection is complete.   This avoids the
-          situation where *way* too many connections are started in a   
-          nested upcall and/or multithreading situation because none 
+          situation where *way* too many connections are started in a
+          nested upcall and/or multithreading situation because none
           of the connection attempts know the others are already in
           progress.
           At the same time it eliminates the wait-for-condition code
           technique for honoring the -MaxMuxedConnections. The old
-          technique is unsafe and ineffective.                    
+          technique is unsafe and ineffective.
 
           These changes were reverted on Fri Aug 17 15:50:19 UTC 2007.
 
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index b5a151a1852..8dc0b415938 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -28,7 +28,7 @@ Echo::echo_payload(Test::Payload const &)
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Echo::echo_payload, aborting\n"));
       // Kill the app
-      raise(9);
+      raise(SIGABRT);
     }
 }
 
@@ -45,9 +45,9 @@ Echo::echo_payload_out (
 
   if (this->abort_counter_ == 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Echo::echo_payload, aborting\n"));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Echo::echo_payload_out, aborting\n"));
       // Kill the app
-      raise(9);
+      raise(SIGABRT);
     }
 
 }
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 328d94c807f..4e4aea2c871 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -36,7 +36,7 @@ public:
   int handle_timeout (ACE_Time_Value const & , void const *)
   {
     // kill the application
-    raise (9);
+    raise (SIGABRT);
     this->reactor ()->cancel_timer (this);
     return 0;
   }