summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Event_Service/Event_Service.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/Event_Service/Event_Service.cpp')
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 9e4f82deb8d..1c6c3a6b62d 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -33,7 +33,7 @@ Event_Service::Event_Service (void)
service_name_ (0),
ior_file_name_ (0),
pid_file_name_ (0),
- event_service_type_ (ES_NEW),
+ event_service_type_ (ES_OLD_MT),
global_scheduler_ (0)
{
}
@@ -76,9 +76,6 @@ Event_Service::run (int argc, char* argv[])
root_poa->the_POAManager (ACE_TRY_ENV);
ACE_TRY_CHECK;
- poa_manager->activate (ACE_TRY_ENV);
- ACE_TRY_CHECK;
-
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService");
if (CORBA::is_nil (naming_obj.in ()))
@@ -194,6 +191,9 @@ Event_Service::run (int argc, char* argv[])
naming_context->rebind (channel_name, ec.in (), ACE_TRY_ENV);
ACE_TRY_CHECK;
+ poa_manager->activate (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
if (this->orb_->run () == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
@@ -210,7 +210,7 @@ Event_Service::run (int argc, char* argv[])
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC");
+ ACE_TRY_ENV.print_exception ("EC");
}
ACE_ENDTRY;