Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions TAO/tests/Transport_Idle_Timeout/Echo_i.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ Echo_i::ping (::CORBA::Long sleep_time, ::CORBA::Long cache_size_expected, ::Tes
bool ok = true;
sleep_with_reactor (this->orb_, sleep_time);

ok &= check ("ping", cache_size(this->orb_), cache_size_expected);

if (!CORBA::is_nil(server))
{
ACE_DEBUG ((LM_DEBUG,
Expand All @@ -72,10 +74,6 @@ Echo_i::ping (::CORBA::Long sleep_time, ::CORBA::Long cache_size_expected, ::Tes
}
ok &= check ("ping_second", cache_size(this->orb_), cache_size_expected_in_server1);
}
else
{
ok &= check ("ping", cache_size(this->orb_), cache_size_expected);
}
return ok;
}

Expand Down
6 changes: 3 additions & 3 deletions TAO/tests/Transport_Idle_Timeout/client_multiple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ tc1_basic_idle_close (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr ec
bool ok = true;

// --- Step 1: establish a transport ---
ok &= echo->ping (0, 2, echo2, 0, 2, 1);
ok &= echo->ping (0, 1, echo2, 0, 2, 1);

ok &= check ("TC-1 after ping (expect 1)", cache_size(orb), 1);

Expand All @@ -159,7 +159,7 @@ tc1_basic_idle_close (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr ec

// Make another call, but let wait sleep_sec after the ping to the second server,
// which means the call takes longer as the idle time.
ok &= echo->ping (0, 2, echo2, sleep_sec, 0, 0);
ok &= echo->ping (0, 1, echo2, sleep_sec, 0, 0);

ok &= check ("TC-1 after ping longer as timeout (expect 1)", cache_size(orb), 1);

Expand All @@ -186,7 +186,7 @@ tc2_reconnect (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr echo2)

// A new ping must succeed without TRANSIENT even though TC-1 caused the
// server to close the connection. TAO's reconnect logic handles this.
ok &= echo->ping (0, 2, echo2, 0, 2, 1);
ok &= echo->ping (0, 1, echo2, 0, 2, 1);

ok &= check ("TC-2 after reconnect ping (expect 1)", cache_size(orb), 1);

Expand Down
Loading