*** empty log message ***

9 files changed, 73 insertions, 71 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 54a014b2733..9ec7a974da1 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Mon Jan 11 19:40:25 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/CosEvent:
+	  for all files in this directory -
+	  replaced TAO_TRY_ENV with TAO_IN_ENV
+
 Mon Jan 11 16:55:57 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * IIOP: removed entire directory tree.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
index e66847171f9..b7cadbdf951 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
@@ -25,24 +25,24 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
-    this->rtec_consumeradmin_->obtain_push_supplier (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, 0);
+    this->rtec_consumeradmin_->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   TAO_CosEC_ProxyPushSupplier_i *pps;
 
   ACE_NEW_RETURN (pps,
                   TAO_CosEC_ProxyPushSupplier_i (this->qos_,
-                                       rtecproxypushsupplier.in ()),
+                                                 rtecproxypushsupplier.in ()),
                   CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
-  return pps->_this (TAO_TRY_ENV);
+  return pps->_this (TAO_IN_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &TAO_IN_ENV)
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
index e0e3c702049..8f2835246f1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
@@ -19,35 +19,35 @@ int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
                                 RtecEventChannelAdmin::EventChannel_ptr rtec,
-                                CORBA::Environment &TAO_TRY_ENV)
+                                CORBA::Environment &TAO_IN_ENV)
 {
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
-    rtec->for_consumers (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+    rtec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   if (this->consumer_admin_.init (consumerqos,
                                   rtec_consumeradmin) == -1)
     return -1;
 
-  this->consumeradmin_ = consumer_admin_._this (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+  this->consumeradmin_ = consumer_admin_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
-    rtec->for_suppliers (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+    rtec->for_suppliers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   if (this->supplier_admin_.init (supplierqos,
                                   rtec_supplieradmin) == -1)
     return -1;
 
-  this->supplieradmin_ = supplier_admin_._this (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+  this->supplieradmin_ = supplier_admin_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   return 0;
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &TAO_IN_ENV)
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object.
@@ -56,7 +56,7 @@ TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &TAO_TRY_ENV)
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &TAO_IN_ENV)
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object, same here..
@@ -65,28 +65,28 @@ TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &TAO_TRY_ENV)
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &TAO_IN_ENV)
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                                                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
   this->consumeradmin_ =  CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &TAO_IN_ENV)
 {
-  this->destroy (TAO_TRY_ENV);
+  this->destroy (TAO_IN_ENV);
   delete this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
index 59f81264e45..e44087e7c4a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
@@ -49,22 +49,22 @@ public:
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
             RtecEventChannelAdmin::EventChannel_ptr rtec,
-            CORBA::Environment &TAO_TRY_ENV);
+            CORBA::Environment &TAO_IN_ENV);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &TAO_TRY_ENV);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &TAO_IN_ENV);
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &TAO_TRY_ENV);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &TAO_IN_ENV);
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (CORBA::Environment &TAO_TRY_ENV);
+  virtual void destroy (CORBA::Environment &TAO_IN_ENV);
   // Destroys this Event Channel object.
 
-  void shutdown (CORBA::Environment &TAO_TRY_ENV);
+  void shutdown (CORBA::Environment &TAO_IN_ENV);
   // destroys this Event Channel object and <delete>s this object.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
index e80b1b57b26..96b16b6f384 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
@@ -51,14 +51,14 @@ public:
   // Destructor.
 
   virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &TAO_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Disconnects the supplier from the event communication.
 
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
-                                     CORBA::Environment &TAO_TRY_ENV);
+                                     CORBA::Environment &TAO_IN_ENV);
   // Connects a push supplier.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
index 66f913a7a17..ec71465985c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
@@ -25,10 +25,10 @@ public:
   // Destructor.
 
   virtual void push (const RtecEventComm::EventSet & data,
-                     CORBA::Environment &TAO_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Disconnects the consumer from the event channel.
 
 private:
@@ -60,23 +60,23 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
   // Deactivate the supplier proxy.
-  this->consumer_->disconnect_push_consumer (TAO_TRY_ENV);
+  this->consumer_->disconnect_push_consumer (TAO_IN_ENV);
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -98,23 +98,23 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
-  this->pps_->disconnect_push_supplier (TAO_TRY_ENV);
+  this->pps_->disconnect_push_supplier (TAO_IN_ENV);
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -122,27 +122,23 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &TAO
 }
 
 void TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer,
-                                                           CORBA::Environment &TAO_TRY_ENV)
+                                                           CORBA::Environment &TAO_IN_ENV)
 {
   if (this->connected ())
     TAO_THROW_ENV (CosEventChannelAdmin::AlreadyConnected (),
-                   TAO_TRY_ENV);
+                   TAO_IN_ENV);
 
   if (push_consumer == CosEventComm::PushConsumer::_nil())
     TAO_THROW_ENV (CORBA::BAD_PARAM (CORBA::COMPLETED_NO),
-                   TAO_TRY_ENV);
-
-  CORBA::Environment &TAO_IN_ENV = TAO_TRY_ENV;
-  // @@ The ACE_NEW_THROW macro uses TAO_THROW which assumes an TAO_IN_ENV declared.
-  // what i need here is an ACE_NEW_THROW_ENV macro.
+                   TAO_IN_ENV);
 
   ACE_NEW_THROW (this->wrapper_,
                  TAO_CosEC_PushConsumerWrapper (push_consumer),
                  CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
-  this->pps_->connect_push_consumer (this->wrapper_->_this (TAO_TRY_ENV),
-                                     this->qos_,
-                                     TAO_TRY_ENV);
+  this->pps_->connect_push_consumer (this->wrapper_->_this (TAO_IN_ENV),
+                                       this->qos_,
+                                       TAO_IN_ENV);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
index cb06b0e32fc..ad3b105db81 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
@@ -43,11 +43,11 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV);
+  virtual void disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV);
   // Ends the event communication and disposes this object.
 
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer,
-                                     CORBA::Environment &TAO_TRY_ENV);
+                                     CORBA::Environment &TAO_IN_ENV);
   // Connects the <push_consumer> to the Event Channel.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
index 41c999b819a..1a9e6523ceb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
@@ -25,11 +25,11 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
-    this->rtec_supplieradmin_->obtain_push_consumer (TAO_TRY_ENV);
-  TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, 0);
+    this->rtec_supplieradmin_->obtain_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   TAO_CosEC_ProxyPushConsumer_i *ppc;
 
@@ -37,11 +37,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_TRY_ENV
                   TAO_CosEC_ProxyPushConsumer_i (this->qos_,
                                                  rtecproxypushconsumer.in ()),
                   CosEventChannelAdmin::ProxyPushConsumer::_nil ());
-  return ppc->_this (TAO_TRY_ENV);
+  return ppc->_this (TAO_IN_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &TAO_TRY_ENV)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &TAO_IN_ENV)
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
index c0eeb5321ce..c18dbf08717 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
@@ -47,11 +47,11 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-  obtain_push_consumer (CORBA::Environment &TAO_TRY_ENV);
+  obtain_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-  obtain_pull_consumer(CORBA::Environment &TAO_TRY_ENV);
+  obtain_pull_consumer(CORBA::Environment &TAO_IN_ENV);
   // Returns a new ProxyPullConsumer_ptr.
 
 private: