diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-06-29 10:47:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-06-29 10:47:54 +0000 |
| commit | 1e7873888569666c93b7660455205694e783ab9d (patch) | |
| tree | 7754c4041492bb16bc6009f966aef13efa09701d | |
| parent | 4e9445bc401e8ef4399e9fc1180713a35f0145c2 (diff) | |
| download | ATCD-1e7873888569666c93b7660455205694e783ab9d.tar.gz | |
Wed Jun 29 10:47:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ORB_Core.cpp:
Fixed coverity errors
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 51df4878ea4..568209e5530 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 29 10:47:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ORB_Core.cpp: + Fixed coverity errors + Mon Jun 27 10:28:15 UTC 2011 Martin Corino <mcorino@remedy.nl> * tao/CDR.h: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 888ad88fcc7..e29612762e7 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2109,19 +2109,22 @@ TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core, TAO_Profile* profile = 0; if (this->service_profile_selection(mp, profile) && profile) { - mp_temp.add_profile(profile); + if (mp_temp.add_profile(profile) == -1) + { + return false; + } } if (!orb_core->optimize_collocation_objects ()) - return 0; + return false; if (!orb_core->use_global_collocation () && orb_core != this) - return 0; + return false; if (!orb_core->is_collocated (profile ? mp_temp : mp)) - return 0; + return false; - return 1; + return true; } int |