ChangeLogTag:Mon May 7 20:30:17 2001 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 33 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index cfa582128c0..e0f7e02f635 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,29 +1,42 @@
+Mon May  7 20:30:17 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/LongUpcalls/ami_server.cpp:
+          Fixed RCSID
+
+        * tests/LongUpcalls/run_test.pl:
+          Fixed timeout, it was way too long
+
+        * tests/AMI_Buffering/svc.conf:
+        * tests/LongUpcalls/svc.conf:
+          Made flushing strategy blocking, until bug 886 gets fixed this
+          is the only workaround.
+
 Mon May  7 21:35:40 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp:
-	  Fixed a compile error with SunCC4.2.	
+        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp:
+          Fixed a compile error with SunCC4.2.
 
 Mon May  7 17:45:01 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/BiDirectional_NestedUpcall/test_i.cpp:
-	* tests/BiDirectional/test_i.cpp: Made some print statements less
-	  verbose.  
+        * tests/BiDirectional_NestedUpcall/test_i.cpp:
+        * tests/BiDirectional/test_i.cpp: Made some print statements less
+          verbose.
 
 Mon May  7 15:21:43 2001  Ossama Othman  <ossama@uci.edu>
 
-	* tao/Object_Ref_Table.h:
-	* tao/Object_Ref_Table.cpp (destroy):
+        * tao/Object_Ref_Table.h:
+        * tao/Object_Ref_Table.cpp (destroy):
 
-	  Added a new destroy() method to explicity release the object
-	  references held in the object reference table.  This method will
-	  be called on ORB shutdown.
+          Added a new destroy() method to explicity release the object
+          references held in the object reference table.  This method will
+          be called on ORB shutdown.
 
-	* tao/ORB_Core.cpp (shutdown):
+        * tao/ORB_Core.cpp (shutdown):
 
-	  Explicitly destroy the object reference table since it contains
-	  references to objects, which themselves may contain reference to
-	  this ORB.  This fixes some problems with cyclic ORB lifetime
-	  dependency problems.
+          Explicitly destroy the object reference table since it contains
+          references to objects, which themselves may contain reference to
+          this ORB.  This fixes some problems with cyclic ORB lifetime
+          dependency problems.
 
 Mon May  7 14:54:48 2001  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -41,7 +54,7 @@ Mon May  7 14:54:48 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Mon May 07 10:47:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-        * tao/GIOP_Message_Base.cpp (write_protocol_header): 
+        * tao/GIOP_Message_Base.cpp (write_protocol_header):
           Optimize the implementation of this function.  Insted of
           marshaling each field of the GIOP header individually we create
           one big octet array, store all the fields there (they are octets
diff --git a/TAO/tests/AMI_Buffering/svc.conf b/TAO/tests/AMI_Buffering/svc.conf
index 9fb75aeb0dd..aa6f8b3e40c 100644
--- a/TAO/tests/AMI_Buffering/svc.conf
+++ b/TAO/tests/AMI_Buffering/svc.conf
@@ -1,4 +1,4 @@
 #
 # $Id$
 #
-static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBFlushingStrategy blocking"
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 1f52149de14..a05f10333d7 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -3,7 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "AMI_Manager.h"
 
-ACE_RCSID(LongUpcalls, blocking_server, "$Id$")
+ACE_RCSID(LongUpcalls, ami_server, "$Id$")
 
 const char *ior_output_file = "test.ior";
 
diff --git a/TAO/tests/LongUpcalls/run_test.pl b/TAO/tests/LongUpcalls/run_test.pl
index 25bf98607cf..c2ecc4cf87e 100755
--- a/TAO/tests/LongUpcalls/run_test.pl
+++ b/TAO/tests/LongUpcalls/run_test.pl
@@ -54,7 +54,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
     exit 1;
 }
 
-$client = $BCL->SpawnWaitKill (240);
+$client = $BCL->SpawnWaitKill (30);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/LongUpcalls/svc.conf b/TAO/tests/LongUpcalls/svc.conf
index 19a1c36439d..0c93a12fc20 100644
--- a/TAO/tests/LongUpcalls/svc.conf
+++ b/TAO/tests/LongUpcalls/svc.conf
@@ -1,5 +1,5 @@
 #
 # $Id$
 #
-static Resource_Factory "-ORBReactorType tp"
+static Resource_Factory "-ORBReactorType tp -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"