summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Server.cpp17
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.cpp1
-rw-r--r--TAO/tao/DynamicAny/DynamicAnyC.cpp34
-rw-r--r--TAO/tao/DynamicInterface/Request.cpp8
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.cpp8
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.cpp20
-rw-r--r--TAO/tests/DynAny_Test/test_dynunion.cpp46
-rw-r--r--TAO/tests/Param_Test/bd_long_seq.cpp7
-rw-r--r--TAO/tests/Param_Test/param_test_i.cpp10
-rw-r--r--TAO/tests/Param_Test/typecode.cpp1
10 files changed, 104 insertions, 48 deletions
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index ed18f60e9b7..6764a787082 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -15,16 +15,25 @@ main (int argc, char *argv[])
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- if (server.init (argc, argv, ACE_TRY_ENV) == -1)
- return 1;
+ int status = server.init (argc, argv, ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
+ if (status == -1)
+ {
+ return 1;
+ }
else
{
server.run (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (server.fini (ACE_TRY_ENV) == -1)
- return 1;
+ status = server.fini (ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ if (status == -1)
+ {
+ return 1;
+ }
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index f04ede29644..f122844d624 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -211,6 +211,7 @@ TAO_DynAny_i::equal (
CORBA::Any_var rhs_any =
rhs->to_any (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
switch (tk)
{
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 0a0e07fec6f..1cb04611e33 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -1000,6 +1000,7 @@ TAO_NAMESPACE_END
{
DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target);
*tmp = DynamicAny::DynAny::_narrow (src, ACE_TRY_ENV);
+ ACE_CHECK;
}
CORBA_Object*
@@ -1494,11 +1495,14 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
- if (!type->equivalent (DynamicAny::_tc_NameValuePair, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
+
+ CORBA::Boolean result =
+ type->equivalent (DynamicAny::_tc_NameValuePair, ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ if (!result)
+ return 0; // not equivalent
+
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -1583,11 +1587,14 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
- if (!type->equivalent (DynamicAny::_tc_NameValuePairSeq, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
+
+ CORBA::Boolean result =
+ type->equivalent (DynamicAny::_tc_NameValuePairSeq, ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ if (!result)
+ return 0; // not equivalent
+
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -1686,11 +1693,14 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
- if (!type->equivalent (DynamicAny::_tc_AnySeq, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
+
+ CORBA::Boolean result =
+ type->equivalent (DynamicAny::_tc_AnySeq, ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ if (!result)
+ return 0; // not equivalent
+
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index aa261099450..cd05ee27d04 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -65,12 +65,12 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
CORBA::NamedValue_ptr result,
CORBA::Flags flags,
CORBA::ExceptionList_ptr exceptions,
- CORBA::Environment &ACE_TRY_ENV)
+ CORBA::Environment &env)
: orb_ (CORBA::ORB::_duplicate (orb)),
args_ (CORBA::NVList::_duplicate (args)),
result_ (CORBA::NamedValue::_duplicate (result)),
flags_ (flags),
- env_ (ACE_TRY_ENV),
+ env_ (env),
exceptions_ (CORBA::ExceptionList::_duplicate (exceptions)),
contexts_ (0),
ctx_ (CORBA::Context::_nil ()),
@@ -95,10 +95,10 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
CORBA::ORB_ptr orb,
const CORBA::Char *op,
- CORBA::Environment &ACE_TRY_ENV)
+ CORBA::Environment &env)
: orb_ (CORBA::ORB::_duplicate (orb)),
flags_ (0),
- env_ (ACE_TRY_ENV),
+ env_ (env),
contexts_ (0),
ctx_ (CORBA::Context::_nil ()),
refcount_ (1),
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 2bf09ecff96..bda2f65e864 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -142,10 +142,14 @@ Test_DynSequence::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: length/set_elements/get_elements\n"));
- if (ftc1->get_length (ACE_TRY_ENV) != 2)
- ++this->error_count_;
+ CORBA::ULong length = ftc1->get_length (ACE_TRY_ENV);
ACE_TRY_CHECK;
+ if (length != 2)
+ {
+ ++this->error_count_;
+ }
+
ftc1->set_length (3,
ACE_TRY_ENV);
ACE_TRY_CHECK;
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index f759d7d743f..ee801f56396 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -192,9 +192,12 @@ Test_DynStruct::run_test (void)
"testing: get_members/set_members\n"));
DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
DynamicAny::DynAny_var sm_base =
- dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct,
- ACE_TRY_ENV);
+ dynany_factory->create_dyn_any_from_type_code (
+ DynAnyTests::_tc_test_struct,
+ ACE_TRY_ENV
+ );
ACE_TRY_CHECK;
DynamicAny::DynStruct_var sm =
@@ -203,9 +206,11 @@ Test_DynStruct::run_test (void)
ACE_TRY_CHECK;
if (CORBA::is_nil (sm.in ()))
- ACE_ERROR_RETURN ((LM_ERROR,
- "DynStruct::_narrow()[2] returned nil\n"),
- -1);
+ {
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "DynStruct::_narrow()[2] returned nil\n"),
+ -1);
+ }
sm->set_members (nvps.in (),
ACE_TRY_ENV);
@@ -213,8 +218,11 @@ Test_DynStruct::run_test (void)
DynamicAny::NameValuePairSeq_var gm = sm->get_members (ACE_TRY_ENV);
ACE_TRY_CHECK;
CORBA::ULong index = 2;
+
if (ACE_OS::strcmp (gm[index].id, "es"))
- ++this->error_count_;
+ {
+ ++this->error_count_;
+ }
fa1->destroy (ACE_TRY_ENV);
ACE_TRY_CHECK;
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 823b152fdcb..52c5f626244 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -118,11 +118,16 @@ Test_DynUnion::run_test (void)
ACE_TRY_CHECK;
CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_TRY_ENV);
ACE_TRY_CHECK;
+
if (s_out2.in ()->equal (data.m_typecode1))
- ACE_DEBUG ((LM_DEBUG,
- "++ OK ++\n"));
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "++ OK ++\n"));
+ }
else
- ++this->error_count_;
+ {
+ ++this->error_count_;
+ }
// Not yet implemented.
#if 0
@@ -139,15 +144,23 @@ Test_DynUnion::run_test (void)
DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (dp2->type (ACE_TRY_ENV)->kind ()
- == ftc1->discriminator_kind (ACE_TRY_ENV))
- ACE_DEBUG ((LM_DEBUG,
- "++ OK ++\n"));
- else
- ++this->error_count_;
+ CORBA::TypeCode_var tc2 = dp2->type (ACE_TRY_ENV);
ACE_TRY_CHECK;
+ CORBA::TCKind kind = ftc1->discriminator_kind (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
+ if (tc2->kind () == kind)
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "++ OK ++\n"));
+ }
+ else
+ {
+ ++this->error_count_;
+ }
+
ACE_DEBUG ((LM_DEBUG,
"testing:member/member_kind/member_name\n"));
@@ -157,15 +170,20 @@ Test_DynUnion::run_test (void)
ACE_TRY_CHECK;
CORBA::TCKind tk = ftc1->member_kind (ACE_TRY_ENV);
ACE_TRY_CHECK;
- CORBA::TypeCode_var tc = dp3->get_typecode (ACE_TRY_ENV);
+ CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_TRY_ENV);
ACE_TRY_CHECK;
+
if (!ACE_OS::strcmp (m_nm.in (), "tc")
&& tk == CORBA::tk_TypeCode
- && data.m_typecode1->equal (tc.in ()))
- ACE_DEBUG ((LM_DEBUG,
- "++ OK ++\n"));
+ && data.m_typecode1->equal (tc3.in ()))
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "++ OK ++\n"));
+ }
else
- ++this->error_count_;
+ {
+ ++this->error_count_;
+ }
ACE_TRY_CHECK;
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 5c2d43b4cf5..eea7c524c9c 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -76,12 +76,9 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req,
}
int
-Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr objref,
- CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr,
+ CORBA::Environment &)
{
- ACE_UNUSED_ARG (objref);
- ACE_UNUSED_ARG (ACE_TRY_ENV);
-
// get some sequence length (32 in this case)
CORBA::ULong len = this->in_->maximum ();
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 544d4c2928d..0ffcbd5365d 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -711,7 +711,11 @@ Param_Test_i::test_objref (Coffee_ptr o1,
if (!CORBA::is_nil (o2))
CORBA::release (o2);
- if (myobj->_is_equivalent (o1, ACE_TRY_ENV))
+ CORBA::Boolean equiv = myobj->_is_equivalent (o1,
+ ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
+ if (equiv)
{
o2 = Coffee::_duplicate (myobj.in ());
o3 = Coffee::_duplicate (myobj.in ());
@@ -961,6 +965,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
Param_Test::Ooops))
{
int d = s1 % 3;
+
if (d == 0)
{
s2 = s1 * 2;
@@ -968,13 +973,16 @@ Param_Test_i::test_exception (CORBA::ULong s1,
return s1 * 4;
}
else if (d == 1)
+ {
ACE_THROW_RETURN (Param_Test::Ooops (" % 3 == 1", s1), 0);
+ }
// This will avoid the compiler
// warning that test_exception is throwing an exception
// not in its THROW_SPEC, but still test TAO's
// conversion of such an exception to UNKNOWN.
this->throw_badboy (ACE_TRY_ENV);
+ ACE_CHECK_RETURN (0);
return 0;
}
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index eab7f742e82..ca4807dab86 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -121,6 +121,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref,
ACE_TRY
{
this->init_parameters (objref, ACE_TRY_ENV);
+ ACE_TRY_CHECK;
CORBA::TypeCode_out out (this->out_);
View Lorry Controller Status