summaryrefslogtreecommitdiff
path: root/TAO/tao/Object.cpp
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-31 20:25:59 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-31 20:25:59 +0000
commitd9a16b0458e0bcdcf67dfd9022a19244387adc16 (patch)
tree59616efb42747cad0654a69742c5ca2d937b4230 /TAO/tao/Object.cpp
parent934e34cf09e453ae28ac47a813cc6d77c9814c30 (diff)
downloadATCD-d9a16b0458e0bcdcf67dfd9022a19244387adc16.tar.gz
ChangeLogTag:Wed Dec 31 14:24:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Object.cpp')
-rw-r--r--TAO/tao/Object.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 2868e27e5fa..456f8ca20cd 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -565,10 +565,13 @@ CORBA::Object::_validate_connection (
inconsistent_policies = 0;
+ CORBA::Boolean retval = 0;
+
#if (TAO_HAS_MINIMUM_CORBA == 1)
ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+ retval = false;
#else
// If the object is collocated then use non_existent to see whether
@@ -586,7 +589,7 @@ CORBA::Object::_validate_connection (
{
inconsistent_policies =
tao_call.get_inconsistent_policies ();
- return false;
+ retval = false;
}
ACE_CATCHANY
{
@@ -595,10 +598,10 @@ CORBA::Object::_validate_connection (
ACE_ENDTRY;
ACE_CHECK_RETURN (false);
- return true;
+ retval = true;
#endif /* TAO_HAS_MINIMUM_CORBA */
- return 0;
+ return retval;
}
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */