ChangeLogTag: Tue Mar 6 13:06:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>

5 files changed, 22 insertions, 19 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index c2da5b9bf35..d6fdacbc050 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Tue Mar  6 13:06:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
+
+        * tests/AMI_Timeouts/client.cpp:
+        * tests/AMI_Timeouts/server.cpp:
+        * tests/AMI_Timeouts/timeout_client.cpp:
+        * tests/AMI_Timeouts/timeout_i.cpp:
+
+          Cleaned up the code and pretty-printed the output of the 
+          debug messages.
+
 Tue Mar  6 11:51:18 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/Wait_On_Leader_Follower.cpp:
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 42a13159b78..fdc7b2c94df 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -141,7 +141,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 7132332a666..78cc53d169c 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -142,7 +142,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index b8b25d6ea3d..cbe285d378a 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -76,7 +76,6 @@ TimeoutClient::svc ()
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "TimeoutClient::svc: Done\n\n"));
@@ -105,7 +104,6 @@ TimeoutClient::initialize ()
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -186,7 +184,7 @@ TimeoutClient::send (bool async,
 
       // Trap this exception and continue...
       ACE_DEBUG ((LM_DEBUG,
-                  "\n==> Trapped a TIMEOUT exception (expected)\n"));
+                  " timeout "));
 
     }
   ACE_ENDTRY;
@@ -204,7 +202,7 @@ TimeoutClient::send (bool async,
   ACE_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Unexpected exception\n\n"));
+                  "Error: Unexpected exception\n\n"));
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -241,10 +239,7 @@ TimeoutClient::synch_test ()
   this->send (INVOKE_SYNCH,
               timeToWait_,    // local
               timeToWait_*2); // remote
-  // @@ Michael: In the collocated, but using the loopback interface, and
-  //             if the reply to this request times out the replies to the
-  //             asynch invocations do not get dispatched
-  //             to the reply handler. Why?
+
   this->send (INVOKE_SYNCH,
               0,    // local
               0);   // remote
@@ -253,7 +248,7 @@ TimeoutClient::synch_test ()
    || timeoutHandler_i_->reply_excep_counter () != 0
    || local_reply_excep_counter_ != 1)
     ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
+                "**** Error in replies %d %d %d.\n\n",
                 timeoutHandler_i_->reply_counter (),
                 timeoutHandler_i_->reply_excep_counter (),
                 local_reply_excep_counter_));
@@ -286,7 +281,7 @@ TimeoutClient::accuracy_test ()
    || timeoutHandler_i_->reply_excep_counter () != 1
    || local_reply_excep_counter_ != 0)
     ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
+                "**** Error in replies %d %d %d.\n\n",
                 timeoutHandler_i_->reply_counter (),
                 timeoutHandler_i_->reply_excep_counter (),
                 local_reply_excep_counter_));
@@ -323,7 +318,7 @@ TimeoutClient::none_test ()
    || timeoutHandler_i_->reply_excep_counter () != 1
    || local_reply_excep_counter_ != 0)
     ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
+                "**** Error in replies %d %d %d.\n\n",
                 timeoutHandler_i_->reply_counter (),
                 timeoutHandler_i_->reply_excep_counter (),
                 local_reply_excep_counter_));
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 77b6c195cd7..6df0030bac1 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -39,8 +39,8 @@ Timeout_i::sendTimeToWait (CORBA::Long msec,
 
   if (msec != 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Timeout_i::sendTimeToWait: sleeping\n\n"));
+      // ACE_DEBUG ((LM_DEBUG,
+      //            "Timeout_i::sendTimeToWait: sleeping\n\n"));
 
       ACE_Time_Value tv (0, msec * 1000);
 	    ACE_OS::sleep (tv);
@@ -52,8 +52,8 @@ Timeout_i::shutdown (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   orb_->shutdown (false);
-  ACE_DEBUG ((LM_DEBUG,
-              "Timeout_i::shutdown: shut down ORB\n\n"));
+  //ACE_DEBUG ((LM_DEBUG,
+  //            "Timeout_i::shutdown: shut down ORB\n\n"));
 }
 
 // Reply Handler implementation
@@ -86,8 +86,8 @@ TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutExceptionHolder *,
                                         CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "excep"));
+  //ACE_DEBUG ((LM_DEBUG,
+  //            "excep"));
   reply_excep_counter_++;
   timer_.stop ();
 }