diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-18 19:04:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-18 19:04:16 +0000 |
| commit | b2577ed369274f6ceb509e9b011d3fcd0823e79a (patch) | |
| tree | d6ff354e65e8b1d40382e0fca7033d131399725f | |
| parent | f81db159872a4fad15ec65c69dd7e4dbf09f3388 (diff) | |
| download | ATCD-b2577ed369274f6ceb509e9b011d3fcd0823e79a.tar.gz | |
Wed Mar 18 19:04:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Profile.cpp:
Removed not used variable and check the return value of the
streaming operators
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Profile.cpp | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 435bea219a5..32e26968389 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 18 19:04:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Profile.cpp: + Removed not used variable and check the return value of the + streaming operators + Wed Mar 18 13:13:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 8ba9610b403..8fd26b564d3 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -347,7 +347,6 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) return; } - Messaging::PolicyValue pv; Messaging::PolicyValueSeq policy_value_seq; size_t length = 0; @@ -364,8 +363,11 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) TAO_OutputCDR out_CDR; policy_value_seq[i].ptype = (*policy_list)[i]->policy_type (); - out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); - (*policy_list)[i]->_tao_encode (out_CDR); + if (!(out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))) + return; + + if (!((*policy_list)[i]->_tao_encode (out_CDR))) + return; length = out_CDR.total_length (); policy_value_seq[i].pvalue.length (static_cast <CORBA::ULong>(length)); |