diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 6177bc0c7ed..91f08daa78f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -19,8 +19,12 @@ TAO_NS_ETCL_FilterFactory::~TAO_NS_ETCL_FilterFactory () } CosNotifyFilter::FilterFactory_ptr -TAO_NS_ETCL_FilterFactory::create (ACE_ENV_SINGLE_ARG_DECL) +TAO_NS_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL) { + this->filter_poa_ = filter_poa; // save the filter poa. + + PortableServer::ServantBase_var servant_var (this); + return _this (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -33,7 +37,8 @@ TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV { // @@: change to "ExTCL" later. if (ACE_OS::strcmp (constraint_grammar, "TCL") != 0 && - ACE_OS::strcmp (constraint_grammar, "ETCL") != 0) + ACE_OS::strcmp (constraint_grammar, "ETCL") != 0 && + ACE_OS::strcmp (constraint_grammar, "EXTENDED_TCL") != 0) ACE_THROW_RETURN (CosNotifyFilter::InvalidGrammar (), 0); @@ -44,18 +49,16 @@ TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV TAO_NS_ETCL_Filter (), CORBA::NO_MEMORY ()); - PortableServer::POA_var my_POA = _default_POA (); - PortableServer::ServantBase_var filter_var (filter); PortableServer::ObjectId_var oid = - my_POA->activate_object (filter - ACE_ENV_ARG_PARAMETER); + this->filter_poa_->activate_object (filter + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); CORBA::Object_var obj = - my_POA->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + this->filter_poa_->id_to_reference (oid.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); return CosNotifyFilter::Filter::_narrow (obj.in () @@ -65,14 +68,14 @@ TAO_NS_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV CosNotifyFilter::MappingFilter_ptr TAO_NS_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/, const CORBA::Any & /*default_value*/ - ACE_ENV_ARG_DECL_NOT_USED //ACE_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::InvalidGrammar )) { - ACE_THROW ((CORBA::NO_IMPLEMENT ())); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); } -ACE_FACTORY_DEFINE (ETCL_Notify_Filtering, TAO_NS_ETCL_FilterFactory) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_NS_ETCL_FilterFactory) |