diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-31 09:10:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-31 09:10:01 +0000 |
| commit | 5bad0aff3847c85f0d3791faa01ccad9b5475dde (patch) | |
| tree | a72884adc6ee206592f82c02be8552af31971890 | |
| parent | 6439276de40081eeb0bac0480c88e3c38e08312f (diff) | |
| download | ATCD-5bad0aff3847c85f0d3791faa01ccad9b5475dde.tar.gz | |
Wed Oct 31 09:09:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/Root_POA.cpp:
Updated if comparison
* tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl:
Increased wait time for slower targets
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Root_POA.cpp | 2 | ||||
| -rwxr-xr-x | TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d1b1da7882b..8d907858a73 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Oct 31 09:09:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PortableServer/Root_POA.cpp: + Updated if comparison + + * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: + Increased wait time for slower targets + Tue Oct 30 10:50:49 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/Root_POA.h: diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 425c915a208..3de8235bf06 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -2294,7 +2294,7 @@ TAO_Root_POA::find_servant_priority ( TAO::ORT_Adapter * TAO_Root_POA::ORT_adapter_i (void) { - if ((this->ort_adapter_ == 0) && (this->ort_adapter_factory_)) + if ((this->ort_adapter_factory_) && (this->ort_adapter_ == 0)) { try { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl index 5c38153c233..c4c07660b20 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl @@ -146,7 +146,7 @@ for ($i = 0; $i < $num_remote_clients; $i++) { } for ($i = 0; $i < $num_remote_clients; $i++) { - $client_status = $CLS[$i]->WaitKill($client->ProcessStopWaitInterval ()); + $client_status = $CLS[$i]->WaitKill(2 * $client->ProcessStopWaitInterval ()); if ($client_status != 0) { print STDERR "ERROR: client $i returned $client_status\n"; |