Mon Nov 21 13:21:03 2005 Chris Cleeland <cleeland_c@ociweb.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index c8ede9d5937..ac918a5eac0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -20,10 +20,9 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 void
 TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
-  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
-
+  // TODO: verify single init call
+  // push_supplier is optional
   this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier);
-
   this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier);
 }
 
@@ -33,22 +32,22 @@ TAO_Notify_SequencePushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
-bool
-TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const
+
+ACE_CString
+TAO_Notify_SequencePushSupplier::get_ior (void) const
 {
-  bool result = false;
+  ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    iorstr = static_cast<const char *> (ior.in ());
-    result = true;
+    result = static_cast<const char*> (ior.in ());
   }
   ACE_CATCHANY
   {
-    ACE_ASSERT(0);
+    result.fast_clear();
   }
   ACE_ENDTRY;
   return result;