summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-24 04:13:33 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-24 04:13:33 +0000
commit17bad8909a7a0ea742c0621107d40736907b0648 (patch)
tree43d1773bb05453a6c3637104a8b28a67e4af8c0c
parentff5be9138a4ebb23618e418b5a9c43f88f47e556 (diff)
downloadATCD-17bad8909a7a0ea742c0621107d40736907b0648.tar.gz
ChangeLogTag:Mon Apr 23 21:10:40 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tests/AMI_Buffering/client.cpp8
-rw-r--r--TAO/tests/Big_Oneways/Coordinator.cpp2
-rw-r--r--TAO/tests/Big_Twoways/Coordinator.cpp2
4 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3d50c1e3aaa..50c0f539f67 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Apr 23 21:10:40 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * tests/AMI_Buffering/client.cpp:
+ * tests/Big_Oneways/Coordinator.cpp:
+ * tests/Big_Twoways/Coordinator.cpp:
+ Fixed ACE_CHECK/ACE_TRY_CHECK mismatches.
+
Mon Apr 23 16:40:07 2001 Carlos O'Ryan <coryan@uci.edu>
* tao/Transport.h:
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 462a70e860f..04238d4d082 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -423,7 +423,7 @@ run_message_count (CORBA::ORB_ptr orb,
Test::AMI_AMI_BufferingHandler_var reply_handler =
reply_handler_impl->_this (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK_RETURN (-1);
CORBA::ULong send_count = 0;
for (int i = 0; i != iterations; ++i)
@@ -538,7 +538,7 @@ run_timeout (CORBA::ORB_ptr orb,
Test::AMI_AMI_BufferingHandler_var reply_handler =
reply_handler_impl->_this (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK_RETURN (-1);
CORBA::ULong send_count = 0;
for (int i = 0; i != iterations; ++i)
@@ -654,7 +654,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
Test::AMI_AMI_BufferingHandler_var reply_handler =
reply_handler_impl->_this (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK_RETURN (-1);
CORBA::ULong send_count = 0;
for (int i = 0; i != iterations; ++i)
@@ -777,7 +777,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
Test::AMI_AMI_BufferingHandler_var reply_handler =
reply_handler_impl->_this (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK_RETURN (-1);
CORBA::ULong bytes_sent = 0;
for (int i = 0; i != iterations; ++i)
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index bde4ea74848..52fa351d814 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -45,7 +45,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
message_count,
this->peer_count_,
ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK;
}
}
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index bde4ea74848..52fa351d814 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -45,7 +45,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
message_count,
this->peer_count_,
ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ ACE_CHECK;
}
}