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

5 files changed, 38 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aa590457347..e7399922f74 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Oct 17 12:32:53 2003  Huang-Ming Huang  <hh1@cse.wustl.edu>
+
+        * CEC_DynamicImplementation.cpp
+        * CEC_TypedConsumerAdmin.cpp
+        * CEC_TypedProxyPushConsumer.cpp
+        * CEC_TypedSupplierAdmin.cpp
+          Fixed problems in emulated exception case.
+
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+          Fixed problem in cygwin build.
+
 Fri Oct 17 12:37:43 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index 023cbd2a31a..96063e3b4fc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -49,7 +49,8 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
       else
         {
           // Populate the NVList from the parameter information.
-          this->typed_event_channel_->create_operation_list (oper_params, list);
+          this->typed_event_channel_->create_operation_list (oper_params, list
+                                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           
           // Get the operation arguments. This ahould demarshal correctly.
@@ -60,7 +61,7 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
           TAO_CEC_TypedEvent typed_event (list, request->operation () );
 
           // Pass the TypedEvent to the TypedProxyPushConsumer
-          this->typed_pp_consumer_->invoke (typed_event);
+          this->typed_pp_consumer_->invoke (typed_event ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index caba8ab004f..721ca9fb449 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -75,7 +75,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
   ))
 
 {
-  ACE_THROW (CosTypedEventChannelAdmin::InterfaceNotSupported ());
+  ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (), 0);
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
@@ -94,7 +94,7 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
   if (result == -1)
     {
-      ACE_THROW (CosTypedEventChannelAdmin::NoSuchImplementation ());
+      ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
     }
 
   return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -104,14 +104,14 @@ CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index d6b6e3afd7e..590f86bda18 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -38,17 +38,29 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer (TAO_CEC_TypedEve
                                          this,
                                          this->typed_event_channel_);
 
-  this->oid_ =
-    this->default_POA_->activate_object (this->dsi_impl_
+  ACE_TRY_NEW_ENV {
+    // tempporary fix, should put this into some init function.
+
+    this->oid_ =
+      this->default_POA_->activate_object (this->dsi_impl_
                                          ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
+  }
+  ACE_CATCHALL {
+  }
+  ACE_ENDTRY;
 }
   
 // Implementation skeleton destructor
 TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 {
-  this->default_POA_->deactivate_object (this->oid_);
-  ACE_TRY_CHECK;
+  ACE_TRY_NEW_ENV {
+    this->default_POA_->deactivate_object (this->oid_ ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCHALL {
+  }
+  ACE_ENDTRY;
 
   delete dsi_impl_;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 9f488611cae..004f939fc2d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -73,7 +73,7 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
 
   if (result == -1)
     {
-      ACE_THROW (CosTypedEventChannelAdmin::InterfaceNotSupported ());
+      ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (),0);
     }
 
   return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -90,21 +90,21 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
   ))
 
 {
-  ACE_THROW (CosTypedEventChannelAdmin::NoSuchImplementation ());
+  ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 // ****************************************************************