summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2008-01-18 22:10:18 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2008-01-18 22:10:18 +0000
commit52dc19240950b1d9f7790bace4237803ad5e1aca (patch)
tree3f19348a15e01793ac0c80132afed6e2bf1df8a5
parente98a50802d40e5f67ee68a838c548fa1562ca1be (diff)
downloadATCD-52dc19240950b1d9f7790bace4237803ad5e1aca.tar.gz
ChangeLogTag: Fri Jan 18 21:51:21 UTC 2008 Adam Mitz <mitza@ociweb.com>
-rw-r--r--TAO/tao/Transport.cpp2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/client.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 05d775a53f0..e0ab14a6695 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -641,8 +641,6 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
max_wait_time);
}
- // The result could be -1 from either the send_synch_message_helper_i() call
- // or the later flush. In either case return -1.
if (flush_result == -1)
{
synch_message.remove_from_list (this->head_, this->tail_);
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index c4ce4539ff5..7240a1bab26 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -220,6 +220,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
catch (const CORBA::TIMEOUT& ex)
{
+ end = ACE_OS::gettimeofday ();
if (timeout == -1 || (end - start).msec () < timeout * .9)
{
ex._tao_print_exception (