summaryrefslogtreecommitdiff
path: root/TAO/tests/AMI/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/AMI/server.cpp')
-rw-r--r--TAO/tests/AMI/server.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 01d3adf7961..397d1f70232 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -62,9 +62,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
- ACE_TRY_CHECK;
-
+ orb->resolve_initial_references("RootPOA");
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
@@ -108,9 +106,9 @@ main (int argc, char *argv[])
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
-
- orb->run (ACE_TRY_ENV);
- ACE_TRY_CHECK;
+
+ if (orb->run () == -1)
+ ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
}
@@ -121,7 +119,6 @@ main (int argc, char *argv[])
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}