ChangeLogTag: Fri Oct 17 01:28:53 2003 Huang-Ming Huang <hh1@cse.wustl.edu>

6 files changed, 43 insertions, 35 deletions

diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index d0c04d42f2e..a1e796ee001 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -98,21 +98,22 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
 
     FtRtecEventChannelAdmin::EventChannel_var ec_ior =
       ec.activate(membership_
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+        ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (report_factory(orb_.in(), ec_ior.in())==-1)
+    if (report_factory(orb_.in(), ec_ior.in() )==-1)
       return -1;
 
     orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
   }
   ACE_CATCHANY
   {
     ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    return -1;
   }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN(-1);
 
   ACE_Thread_Manager::instance()->wait();
   return 0;
@@ -201,7 +202,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
 
 void
 FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL)
 {
     RtecScheduler::Scheduler_var scheduler;
     if (CORBA::is_nil(naming_context)) {
@@ -210,7 +211,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
             CORBA::NO_MEMORY());
 
         scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ACE_CHECK;
 
         if (ACE_Scheduler_Factory::server(scheduler.in()) == -1)
             ACE_ERROR((LM_ERROR,"Unable to install scheduler\n"));
@@ -259,6 +260,7 @@ int
 FT_EventService::report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec)
 {
+  ACE_TRY_NEW_ENV {
     char* addr = ACE_OS::getenv("EventChannelFactoryAddr");
 
     if (addr != NULL) {
@@ -283,7 +285,12 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
 
       stream.close();
     }
-    return 0;
+  }
+  ACE_CATCHALL {
+    return -1;
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
 void FT_EventService::become_primary()
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index d65b67dc17c..41075f5992f 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -34,7 +34,7 @@ public:
 private:
   int parse_args (int argc, ACE_TCHAR* argv []);
   void setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL);
   int report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec);
   virtual void become_primary();
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 2ec8cf8f842..16c575ff06b 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -25,7 +25,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   const char * type_id,
   const FT::Criteria & the_criteria,
   FT::GenericFactory::FactoryCreationId_out factory_creation_id
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
+  ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -69,7 +69,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
 
 void EventChannelFactory_i::delete_object (
   const FT::GenericFactory::FactoryCreationId & factory_creation_id
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
+  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -165,37 +165,38 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   ACE_SOCK_Stream stream;
 
   ACE_DEBUG((LM_DEBUG, "accepting connection from event channel\n"));
-  if (acceptor.accept(stream, &client_addr, &timeout) != -1)
-  {
-    ACE_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n",
-      client_addr.get_host_name(), client_addr.get_port_number() ));
+  if (acceptor.accept(stream, &client_addr, &timeout) == -1)
+     ACE_ERROR_RETURN((LM_ERROR, "accept fail\n"), 0);
 
-    // receive the ior string from the created object
 
-    char ior[5000] = {'0'};
-    int n = 0;
-    int byteRead=0;
-    while ((n = stream.recv(ior+byteRead, 5000-byteRead)))  {
-      byteRead += n;
-    }
+  ACE_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n",
+    client_addr.get_host_name(), client_addr.get_port_number() ));
+
+  // receive the ior string from the created object
 
-    if (strlen(ior)  ==0)
-      return result;
+  char ior[5000] = {'0'};
+  int n = 0;
+  int byteRead=0;
+  while ((n = stream.recv(ior+byteRead, 5000-byteRead)))  {
+    byteRead += n;
+  }
 
+  if (strlen(ior)  ==0)
+    return result;
 
-    CORBA::Object_var result = orb->string_to_object(ior
+  ACE_TRY_NEW_ENV {
+    CORBA::Object_var result  = orb->string_to_object(ior
       ACE_ENV_ARG_PARAMETER);
-
-    ACE_CHECK_RETURN(result);
+    ACE_TRY_CHECK;
 
     if (objects.bind(id, result) ==0){
       return result._retn();
     }
   }
-  else {
-    ACE_DEBUG((LM_DEBUG,"accept fail\n"));
+  ACE_CATCHALL {
   }
+  ACE_ENDTRY;
 
-  return result;
+  return 0;
 }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
index 9ceba6abc3b..28a1c8f668e 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
@@ -29,7 +29,7 @@ public:
     const char * type_id,
     const FT::Criteria & the_criteria,
     FT::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -42,7 +42,7 @@ public:
 
   virtual void delete_object (
     const FT::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index 0a68d5fcdf5..06ecb22ba0d 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -57,10 +57,9 @@ int main(int argc, ACE_TCHAR* argv[])
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
+                                         ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
     if (parse_args(argc, argv) == -1)
       return -1;
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 9178b08b0be..47f053e6e61 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -80,7 +80,8 @@ int main(int argc,  ACE_TCHAR** argv)
 {
   ACE_TRY_NEW_ENV
   {
-    orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER);
+    orb = CORBA::ORB_init (argc, argv, ""
+                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (parse_args(argc, argv)==-1)