Sun Mar 5 16:36:25 2000 Pradeep Gore <pradeep@flamenco.cs.wustl.edu>

5 files changed, 34 insertions, 21 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 2246ca142b5..97617d8a444 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -37,19 +37,8 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, C
     ::_narrow (obj._retn (), ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
 
-  // -- debug
-  CosNotifyChannelAdmin::ChannelID id;
-  CosNotification::QoSProperties initial_qos_;
-  CosNotification::AdminProperties initial_admin_;
-
-  channelfactory->my_ref_->create_channel (initial_qos_,
-                                           initial_admin_,
-                                           id, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  // -- debug
-
   return CosNotifyChannelAdmin::EventChannelFactory::
-    _duplicate (channelfactory->my_ref_);
+    _duplicate (channelfactory->my_ref_.in ());
 }
 
 void
@@ -133,13 +122,23 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan
                    CosNotifyChannelAdmin::ChannelNotFound
                    ))
 {
-  CORBA::Object_var obj =
-    this->resource_manager_->id_to_reference (id, this->ec_POA_.in (),
-                                              ACE_TRY_ENV);
-  ACE_THROW_RETURN (CosNotifyChannelAdmin::ChannelNotFound (),
-                    CosNotifyChannelAdmin::EventChannel::_nil ());
-
-  return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ());
+  ACE_TRY
+    {
+      CORBA::Object_var obj =
+        this->resource_manager_->id_to_reference (id, this->ec_POA_.in (),
+                                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      return CosNotifyChannelAdmin::EventChannel::_narrow (obj._retn ());
+    }
+  ACE_CATCHANY // Translate any exception to "not found"
+    {
+      ACE_THROW_RETURN (CosNotifyChannelAdmin::ChannelNotFound (),
+                        CosNotifyChannelAdmin::EventChannel::_nil ());
+    }
+  ACE_ENDTRY;
+
+  return CosNotifyChannelAdmin::EventChannel::_nil ();
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index faa18d17d8b..24f59efa85a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -170,7 +170,7 @@ TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &/*ACE_TRY_ENV*/)
                    ))
 {
   return CosNotifyChannelAdmin::EventChannelFactory
-    ::_duplicate (this->my_factory_);
+    ::_duplicate (this->my_factory_.in ());
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
index c84a8fbdb87..1f48855ecf6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
@@ -159,7 +159,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
-                   CORBA::SystemExcqeption
+                   CORBA::SystemException
                    ))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.cpp
index e12dc74366e..887a71401bc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.cpp
@@ -78,12 +78,19 @@ TAO_Notify_PushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException,
+                   CosNotifyComm::InvalidEventType
+                   ))
 {
   // TODO:
 }
 
 void
 TAO_Notify_PushConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException
+                   ))
 {
   this->deactivate (ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.cpp
index e8b329f89ba..23c832b3ea1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.cpp
@@ -81,12 +81,19 @@ TAO_Notify_PushSupplier::_default_POA (CORBA::Environment& /* env */)
 
 void
 TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+      ACE_THROW_SPEC ((
+                       CORBA::SystemException,
+                       CosNotifyComm::InvalidEventType
+                       ))
 {
   // TODO:
 }
 
 void
 TAO_Notify_PushSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException
+                   ))
 {
   this->deactivate (ACE_TRY_ENV);
 }