ChangeLogTag:Tue Nov 05 17:32:22 2002 Pradeep Gore <pradeep@oomworks.com>

6 files changed, 45 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 694e1032e8f..2029787238a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov 05 17:32:22 2002  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+	* orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+	* orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+	* orbsvcs/orbsvcs/Notify/Proxy_T.cpp:
+	* orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+	
+	  Corrected the way IDSequences are populated. Thanks to Yamuna
+	  for helping to debug this. 
+
 Tue Nov 05 12:01:25 2002  Pradeep Gore  <pradeep@oomworks.com>
 
 	* orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 9ff22c0d75f..69fcb6701cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -111,12 +111,14 @@ TAO_NS_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  CosNotifyChannelAdmin::ProxyIDSeq* seq;
+  CosNotifyChannelAdmin::ProxyIDSeq* seq_ptr;
 
-  ACE_NEW_THROW_EX (seq,
+  ACE_NEW_THROW_EX (seq_ptr,
                     CosNotifyChannelAdmin::ProxyIDSeq (),
                     CORBA::NO_MEMORY ());
 
+  CosNotifyChannelAdmin::ProxyIDSeq_var seq (seq_ptr);
+
   seq->length (this->proxy_id_list_.size ());
 
   TAO_NS_EventChannelFactory::TAO_NS_Object_Id_Seq::CONST_ITERATOR iter (this->proxy_id_list_);
@@ -127,7 +129,7 @@ TAO_NS_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   for (iter.first (); iter.next (object_id); iter.advance (), ++i)
     seq[i] = *object_id;
 
-  return seq;
+  return seq._retn ();
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -249,7 +251,7 @@ TAO_NS_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /************ UNIMPLMENTED METHODS *************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 9089ae8113d..a9fc17ee916 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -247,12 +247,14 @@ TAO_NS_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  CosNotifyChannelAdmin::AdminIDSeq* seq;
+  CosNotifyChannelAdmin::AdminIDSeq* seq_ptr;
 
-  ACE_NEW_THROW_EX (seq,
+  ACE_NEW_THROW_EX (seq_ptr,
                     CosNotifyChannelAdmin::AdminIDSeq (),
                     CORBA::NO_MEMORY ());
 
+  CosNotifyChannelAdmin::AdminIDSeq_var seq (seq_ptr);
+
   seq->length (this->consumer_admin_id_list_.size ());
 
   TAO_NS_Object_Id_Seq::CONST_ITERATOR iter (this->consumer_admin_id_list_);
@@ -263,7 +265,7 @@ TAO_NS_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
   for (iter.first (); iter.next (object_id); iter.advance (), ++i)
     seq[i] = *object_id;
 
-  return seq;
+  return seq._retn ();
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
@@ -272,12 +274,14 @@ TAO_NS_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  CosNotifyChannelAdmin::AdminIDSeq* seq;
+  CosNotifyChannelAdmin::AdminIDSeq* seq_ptr;
 
-  ACE_NEW_THROW_EX (seq,
+  ACE_NEW_THROW_EX (seq_ptr,
                     CosNotifyChannelAdmin::AdminIDSeq (),
                     CORBA::NO_MEMORY ());
 
+  CosNotifyChannelAdmin::AdminIDSeq_var seq (seq_ptr);
+
   seq->length (this->supplier_admin_id_list_.size ());
 
   TAO_NS_Object_Id_Seq::CONST_ITERATOR iter (this->consumer_admin_id_list_);
@@ -288,7 +292,7 @@ TAO_NS_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
   for (iter.first (); iter.next (object_id); iter.advance (), ++i)
     seq[i] = *object_id;
 
-  return seq;
+  return seq._retn ();
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index af178867f15..a4c45250348 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -75,7 +75,7 @@ void TAO_NS_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NS_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_NS_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -83,12 +83,12 @@ TAO_NS_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DEC
 {
   CosNotifyFilter::Filter_var filter_var;
 
-  if (this->filter_list_.find (filter,
+  if (this->filter_list_.find (filter_id,
                                filter_var) == -1)
     ACE_THROW_RETURN (CosNotifyFilter::FilterNotFound (),
                       0);
 
-  return CosNotifyFilter::Filter::_duplicate (filter_var.in ());
+  return filter_var._retn ();
 }
 
 CosNotifyFilter::FilterIDSeq*
@@ -100,14 +100,16 @@ TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   // Figure out the length of the list.
   size_t len = this->filter_list_.current_size ();
 
-  CosNotifyFilter::FilterIDSeq* list = 0;
+  CosNotifyFilter::FilterIDSeq* list_ptr;
 
   // Allocate the list of <len> length.
-  ACE_NEW_THROW_EX (list,
-                    CosNotifyFilter::FilterIDSeq (len),
+  ACE_NEW_THROW_EX (list_ptr,
+                    CosNotifyFilter::FilterIDSeq,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  CosNotifyFilter::FilterIDSeq_var list (list_ptr);
+
   list->length (len);
 
   FILTER_LIST_ITER iter (this->filter_list_);
@@ -115,15 +117,12 @@ TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 
   u_int index;
 
-  for (index = 0; iter.done () == 0; iter.advance (), ++index)
+  for (index = 0; iter.next (entry) != 0; iter.advance (), ++index)
     {
-      if (iter.next (entry) != 0)
-        {
-          list[index] = entry->ext_id_;
-        }
+      list[index] = entry->ext_id_;
     }
 
-  return list;
+  return list._retn ();
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index df767f312f1..06291c3cf14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -55,7 +55,7 @@ TAO_NS_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-        return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_NS_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 71c33ab4166..2b4eb07fda4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -127,19 +127,20 @@ TAO_NS_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return this->filter_operator_;
 }
 
-
 CosNotifyChannelAdmin::ProxyIDSeq*
 TAO_NS_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  CosNotifyChannelAdmin::ProxyIDSeq* seq;
+  CosNotifyChannelAdmin::ProxyIDSeq* seq_ptr;
 
-  ACE_NEW_THROW_EX (seq,
+  ACE_NEW_THROW_EX (seq_ptr,
                     CosNotifyChannelAdmin::ProxyIDSeq (),
                     CORBA::NO_MEMORY ());
 
+  CosNotifyChannelAdmin::ProxyIDSeq_var seq (seq_ptr);
+
   seq->length (this->proxy_id_list_.size ());
 
   TAO_NS_Object_Id_Seq::CONST_ITERATOR iter (this->proxy_id_list_);
@@ -150,7 +151,7 @@ TAO_NS_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
   for (iter.first (); iter.next (object_id); iter.advance (), ++i)
     seq[i] = *object_id;
 
-  return seq;
+  return seq._retn ();
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -250,7 +251,7 @@ TAO_NS_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr