diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-28 18:31:01 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-28 18:31:01 +0000 |
| commit | cdb6fd66611283a0314ab23e08472d11dae4f0e4 (patch) | |
| tree | fd6ae8c3db752254802dfaafd1543974a4741e47 /TAO/tao/Policy_Validator.cpp | |
| parent | f984aa2bff444f381570d2f97ac9ba958926fb6b (diff) | |
| download | ATCD-cdb6fd66611283a0314ab23e08472d11dae4f0e4.tar.gz | |
ChangeLogTag:Tue Oct 28 12:02:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Policy_Validator.cpp')
| -rw-r--r-- | TAO/tao/Policy_Validator.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index c220af9ce94..97e5fe891aa 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -6,12 +6,10 @@ #include "ace/Log_Msg.h" - ACE_RCSID (tao, Policy_Validator, "$Id$") - TAO_Policy_Validator *TAO_Policy_Validator::last_ = 0; TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) @@ -24,9 +22,14 @@ TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) TAO_Policy_Validator::~TAO_Policy_Validator (void) { if (this == this->last_) - this-> last_ = 0; + { + this-> last_ = 0; + } + if (this->next_) - delete this->next_; + { + delete this->next_; + } } void @@ -41,22 +44,26 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) if (this->last_ == validator) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) Skipping validator [0x%x] ") - ACE_LIB_TEXT ("since it would create a circular list \n"), - validator)); + { + ACE_DEBUG (( + LM_DEBUG, + ACE_LIB_TEXT ("(%P|%t) Skipping validator [0x%x] ") + ACE_LIB_TEXT ("since it would create a circular list \n"), + validator + )); + } return; } - this->last_ = this->last_->next_ = validator; + this->last_ = this->last_->next_ = validator; } } void TAO_Policy_Validator::validate (TAO_Policy_Set &policies - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->validate_impl (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -85,6 +92,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies CORBA::Boolean TAO_Policy_Validator::legal_policy (CORBA::PolicyType type) { - return (this->legal_policy_impl (type) || - ((this->next_ != 0) && this->next_->legal_policy_impl (type))); + return (this->legal_policy_impl (type) + || ((this->next_ != 0) + && this->next_->legal_policy_impl (type))); } |