summaryrefslogtreecommitdiff
path: root/TAO/tests/NestedUpcall
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-27 23:35:37 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-27 23:35:37 +0000
commit9884620d7446544a3940a41250b7f4e077dc87b4 (patch)
treeaaf9302e9046444a95e3a0df77eb4afad11ea06a /TAO/tests/NestedUpcall
parent629f994c12e6942b474c6f60ac1155423cd34b7c (diff)
downloadATCD-9884620d7446544a3940a41250b7f4e077dc87b4.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO/tests/NestedUpcall')
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp6
-rw-r--r--TAO/tests/NestedUpcall/Reactor/client.cpp16
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp16
3 files changed, 2 insertions, 36 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index b7d1f8df4bd..220743064e6 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -238,11 +238,7 @@ MT_Server::run_ORB_briefly (void)
if (this->iterations_ > 0)
{
CORBA::Environment env;
- ACE_Time_Value tv = ACE_Time_Value::zero;
- if (this->orb_manager_ptr_->run (env, &tv) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "MT_Server::run"),
- -1);
+
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) MT_Server::run: "
"going to call distant MT Object\n"));
diff --git a/TAO/tests/NestedUpcall/Reactor/client.cpp b/TAO/tests/NestedUpcall/Reactor/client.cpp
index 9191230d647..8ad4f84679f 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/client.cpp
@@ -114,21 +114,7 @@ NestedUpCalls_Client::run (void)
auto_ptr<EventHandler_i> eh_impl (new EventHandler_i);
EventHandler_var eh = eh_impl->_this (TAO_TRY_ENV);
- // Get into the event loop briefly...just to make sure that the
- // ORB gets a chance to set things up for us to be a server.
- // What this really means is that there's a listening port.
- //
- // The bad thing is that we have to do something non-standard
- // such as call orb->run() with a zero timeout. It would be
- // nice if the spec gave us a standard way to do this.
- if (orb_->run (ACE_Time_Value::zero) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%s: %p\n",
- argv_[0], "unable to get the ORB Core to listen"),
- -1);
-
- // Now, after all that, we can invoke an operation on the remote
- // side.
+ // Now, we can invoke an operation on the remote side.
CORBA::Long r = this->reactor_->register_handler (eh.in (), TAO_TRY_ENV);
// We ought to have a result!
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index fc2f9640955..e4d0e19a3c8 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -227,22 +227,6 @@ Initiator_Server::run (CORBA::Environment& env)
{
TAO_TRY
{
-
- // Get into the event loop briefly...just to make sure that the
- // ORB gets a chance to set things up for us to be a server.
- // What this really means is that there's a listening port.
- //
- // The bad thing is that we have to do something non-standard
- // such as call orb->run() with a zero timeout. It would be
- // nice if the spec gave us a standard way to do this.
- ACE_Time_Value tv = ACE_Time_Value::zero;
- if (orb_manager_.run (TAO_TRY_ENV, &tv) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%s: %p\n",
- argv_[0], "unable to get the ORB Core to listen"),
- -1);
- TAO_CHECK_ENV;
-
ACE_DEBUG ((LM_DEBUG,
"Initiator_Server::run: Trying to invoke foo on Object A\n"));