diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-17 09:10:00 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-17 09:10:00 +0000 |
| commit | 05f6cb3d96ff6aeb334ac44dc8e9ae46f98412f5 (patch) | |
| tree | 6b02ff163aecfd3f97a3bb6de11250f32a29e610 | |
| parent | cc4ee4627feb1a27dc69e638dd6df3b850c6b334 (diff) | |
| download | ATCD-05f6cb3d96ff6aeb334ac44dc8e9ae46f98412f5.tar.gz | |
Mon Mar 17 09:11:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/CSD_Framework/CSD_POA.cpp:
Fixed possible crash when pointer would be zero
* tao/SystemException.cpp:
Added missing comma
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_POA.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/SystemException.cpp | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d143c81e9ad..2eada97e003 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Mar 17 09:11:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/CSD_Framework/CSD_POA.cpp: + Fixed possible crash when pointer would be zero + + * tao/SystemException.cpp: + Added missing comma + Tue Mar 11 14:55:24 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Transport.h: diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index 8321b598f38..9c6a0e0dda4 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -79,11 +79,14 @@ TAO_CSD_POA::new_POA (const String &name, TAO_CSD_Strategy_Repository *repo = ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - CSD_Framework::Strategy_var strategy = repo->find (name); - - if (! ::CORBA::is_nil (strategy.in ())) + if (repo) { - poa->set_csd_strategy (strategy.in ()); + CSD_Framework::Strategy_var strategy = repo->find (name); + + if (! ::CORBA::is_nil (strategy.in ())) + { + poa->set_csd_strategy (strategy.in ()); + } } return poa; diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 153f8c7db4b..5d99cb8ca96 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -508,7 +508,7 @@ CORBA::SystemException::_tao_get_omg_exception_description ( "Attempt to call register_initial_reference with a null Object.", // 27 "Invalid component Id in portable interceptor.", // 28 "Invalid profile Id in portable interceptor.", // 29 - "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30 + "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides.", // 30 "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31 "DII asked to create request for an implicit operation.", // 32, "An OTS/XA integration xa_ call returned XAER_INVAL.", // 33 |