summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2000-10-02 18:51:32 +0000
committerbala <balanatarajan@users.noreply.github.com>2000-10-02 18:51:32 +0000
commit55da61e4bc96c57387ebbe7fafbd01883658909b (patch)
treecf36746f1a333991d8479fe77ffb71995e0624aa /TAO/orbsvcs/tests
parent3c7edb739b596313a3e15fe1373bd488c2f37009 (diff)
downloadATCD-55da61e4bc96c57387ebbe7fafbd01883658909b.tar.gz
ChangeLogTag: Mon Oct 2 13:50:08 2000 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/tests')
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp33
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/README4
2 files changed, 23 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 23f348e04d9..943dc098c7a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -272,7 +272,7 @@ Manager::write_to_file (void)
CORBA::ORB_ptr
Manager::orb (void)
{
- this->orb_.in ();
+ return this->orb_.in ();
}
Client_i::Client_i (CORBA::ORB_ptr orb)
@@ -312,20 +312,18 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
0,
ACE_TRY_ENV);
ACE_CHECK;
- cout << "String to OBJ" <<endl;
+
CORBA::Object_var object =
this->orb_->string_to_object (data,
ACE_TRY_ENV);
ACE_CHECK;
- cout << "String to OBJ 1" <<endl;
// Combined IOR stuff
Simple_Server_var server =
Simple_Server::_narrow (object.in (),
ACE_TRY_ENV);
ACE_CHECK;
- cout << " Narrow done " <<endl;
if (CORBA::is_nil (server.in ()))
{
ACE_ERROR ((LM_ERROR,
@@ -333,7 +331,6 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
data));
}
- cout << "Start test " <<endl;
run_test (server.in (),
ACE_TRY_ENV);
ACE_CHECK;
@@ -346,21 +343,29 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
void run_test (Simple_Server_ptr server,
CORBA::Environment &ACE_TRY_ENV)
{
+ // We do this twice as we know that there are only two servers.
for (CORBA::ULong i = 0;
- i < 10;
+ i < 2;
i++)
{
ACE_TRY
{
- // Make a remote call
- server->remote_call (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+ for (CORBA::ULong j = 0;
+ j < 10;
+ j++)
+ {
+ // Make a remote call
+ server->remote_call (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+ }
ACE_DEBUG ((LM_DEBUG,
- "I am going to shutdown \n"));
+ ACE_TEXT ("*********************************\n")));
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("I am going to shutdown the server\n")));
server->shutdown (ACE_TRY_ENV);
ACE_TRY_CHECK;
- ACE_OS::sleep (10);
+ ACE_OS::sleep (2);
}
ACE_CATCH (CORBA::TRANSIENT, t)
{
@@ -371,9 +376,9 @@ void run_test (Simple_Server_ptr server,
else
{
ACE_DEBUG ((LM_DEBUG,
- "The completed status %d\n", t.completed ()));
+ ACE_TEXT ("The completed status %d\n"), t.completed ()));
ACE_DEBUG ((LM_DEBUG,
- "Automagically re-issuing request on TRANSIENT\n"));
+ ACE_TEXT ("Automagically re-issuing request on TRANSIENT\n")));
ACE_OS::sleep (1);
}
}
@@ -381,7 +386,7 @@ void run_test (Simple_Server_ptr server,
{
ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
ACE_DEBUG ((LM_DEBUG,
- "Automagically re-issuing request on COMM_FAILURE\n"));
+ ACE_TEXT ("Automagically re-issuing request on COMM_FAILURE\n")));
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/README b/TAO/orbsvcs/tests/FaultTolerance/IOGR/README
index 40c06616930..5c209a35df4 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/README
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/README
@@ -14,3 +14,7 @@ Run the application as follows:
$./server -o <file1.ior>
$./server -o <file2.ior>
$./Manager -a file://<file1.ior> -b file://<file2.ior> -c <output.ior>
+
+Due to teh transparent reinvocation functaionality for FT CORBA, the
+application would switch to the new profile without throwing an
+exception to the application. \ No newline at end of file