summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp')
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp67
1 files changed, 20 insertions, 47 deletions
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 7245e7ddcdf..3d2963be284 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -14,13 +14,11 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
: verbose_ (verbose)
{
// Initialize the offer sequences and structures.
- this->create_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->create_offers ();
// Obtain the necessary trading service interfaces.
- this->register_ = lookup_if->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->admin_ = lookup_if->admin_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- // ACE_CHECK;
+ this->register_ = lookup_if->register_if ();
+ this->admin_ = lookup_if->admin_if ();
}
TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
@@ -34,7 +32,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
}
void
-TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -56,7 +54,6 @@ TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
}
this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER);
- // ACE_CHECK;
}
void
@@ -77,37 +74,32 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
{
for (int i = 0; i < NUM_OFFERS; i++)
{
- CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_ptr offer_obj= this->plotter_[i]._this ();
CosTrading::OfferId_var offer_id =
reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[1],
this->props_plotters_[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
}
- offer_obj = this->printer_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_obj = this->printer_[i]._this ();
offer_id = reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[2],
this->props_printers_[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
}
- offer_obj = this->fs_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_obj = this->fs_[i]._this ();
offer_id = reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[3],
@@ -127,11 +119,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
ACE_RE_THROW;
}
ACE_ENDTRY;
- // ACE_CHECK;
}
void
-TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers_to_all (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -150,8 +141,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
}
- CosTrading::Link_var link_if = this->register_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::Link_var link_if = this->register_->link_if ();
if (this->verbose_)
{
@@ -159,8 +149,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
" linked to the root trader.\n"));
}
- CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
if (this->verbose_)
{
@@ -180,7 +169,6 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::Link::LinkInfo_var link_info =
link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (int j = 0; j < NUM_OFFERS; j++)
{
@@ -196,7 +184,6 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
}
this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -208,7 +195,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
void
-TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::withdraw_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
@@ -220,8 +207,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::ULong length;
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -229,7 +215,6 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
for (CORBA::ULong i = 0; i < length; i++)
{
this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -242,7 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::describe_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
@@ -253,8 +238,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
CORBA::ULong length;
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -267,14 +251,12 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
{
CosTrading::Register::OfferInfo_var offer_info =
this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
}
}
@@ -289,7 +271,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::modify_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented,
CosTrading::IllegalOfferId,
@@ -307,8 +289,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -330,7 +311,6 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
del_list,
modify_list
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -344,7 +324,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
void
TAO_Offer_Exporter::
-withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
+withdraw_offers_using_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -365,19 +345,16 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->register_->
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->register_->
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -389,7 +366,7 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
}
CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::grab_offerids (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented))
{
@@ -406,7 +383,6 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::OfferIdSeq_out (offer_id_seq),
CosTrading::OfferIdIterator_out (offer_id_iter)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
{
@@ -420,7 +396,6 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
offer_id_iter->next_n (length,
CosTrading::OfferIdSeq_out (id_seq)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int offers = id_seq->length ();
int old_length = offer_id_seq->length ();
@@ -433,8 +408,7 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
}
while (any_left);
- offer_id_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_id_iter->destroy ();
}
if (this->verbose_)
@@ -452,13 +426,12 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
// @@ redundant.
- // ACE_CHECK_RETURN (offer_id_seq);
return offer_id_seq;
}
void
-TAO_Offer_Exporter::create_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Exporter::create_offers (void)
{
const int QUEUE_SIZE = 4;
View Lorry Controller Status