diff options
| -rw-r--r-- | TAO/ChangeLog | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7c1658473c9..e7b1382844e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -61,7 +61,6 @@ Mon Sep 22 11:57:42 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> as it was not used in the method. This should remove the warning on Redhat Explicit Template build. ->>>>>>> 1.2560 Fri Sep 19 07:49:19 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * tests/RTScheduling/Current/Makefile (SRC): diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 59b35423f5a..810aa8e1f9b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -29,7 +29,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val { TimeBase::TimeT value; if ((val >>= value) == 0) - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), + ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); TAO_FT_Request_Duration_Policy *tmp; @@ -112,7 +112,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val { FT::HeartbeatPolicyValue *value; if ((val >>= value) == 0) - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), + ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); TAO_FT_Heart_Beat_Policy *tmp; @@ -203,7 +203,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val CORBA::Boolean value; if ((val >>= CORBA::Any::to_boolean (value)) == 0) - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), + ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); TAO_FT_Heart_Beat_Enabled_Policy *tmp; |