Tue Aug 29 20:28:30 2000 Pradeep Gore <pradeep@cs.wustl.edu>

1 files changed, 25 insertions, 35 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 97f7d0338ea..6b3237d7e0e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -107,19 +107,13 @@ TAO_Notify_EventChannel_i::get_event_manager (void)
 }
 
 void
-TAO_Notify_EventChannel_i::consumer_admin_destroyed (CosNotifyChannelAdmin::AdminID CA_ID)
+TAO_Notify_EventChannel_i::consumer_admin_destroyed (CosNotifyChannelAdmin::AdminID /*CA_ID*/)
 {
-  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-
-  this->consumer_admin_ids_.put (CA_ID);
 }
 
 void
-TAO_Notify_EventChannel_i::supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID)
+TAO_Notify_EventChannel_i::supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID /*SA_ID*/)
 {
-  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-
-  this->supplier_admin_ids_.put (SA_ID);
 }
 
 PortableServer::POA_ptr
@@ -227,25 +221,23 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter
     ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
     id = this->consumer_admin_ids_.get ();
+  }
 
-    consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV);
-    ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
-
-    CORBA::Object_var obj =
-      this->poa_factory_->activate_object_with_id (id,
-                                                   this->CA_POA_.in (),
-                                                   consumer_admin,
-                                                   ACE_TRY_ENV);
-    ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
+  consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
-    this->consumer_admin_ids_.next ();
+  CORBA::Object_var obj =
+    this->poa_factory_->activate_object_with_id (id,
+                                                 this->CA_POA_.in (),
+                                                 consumer_admin,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
-    // Register the group listener.
-    this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
+  // Register the group listener.
+  this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
-    return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ());
-  }
+  return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -264,21 +256,19 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                         CORBA::INTERNAL ());
     id = this->supplier_admin_ids_.get ();
+  }
 
-    supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV);
-    ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
-
-    CORBA::Object_var obj = this->poa_factory_->
-      activate_object_with_id (id,
-                               this->SA_POA_.in (),
-                               supplieradmin,
-                               ACE_TRY_ENV);
-    ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
+  supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
-    supplier_admin_ids_.next ();
+  CORBA::Object_var obj = this->poa_factory_->
+    activate_object_with_id (id,
+                             this->SA_POA_.in (),
+                             supplieradmin,
+                             ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
-    return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
-  }
+  return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr