diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-09 13:54:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-09 13:54:57 +0000 |
| commit | e52fdcaa14195297752833257139aa76b1fcd1f8 (patch) | |
| tree | 93a8405281cb49867e9502db2955da450a70b471 | |
| parent | ccfbe726d96ec528112239a476affbd570eb47d2 (diff) | |
| download | ATCD-e52fdcaa14195297752833257139aa76b1fcd1f8.tar.gz | |
Wed Dec 9 13:54:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Servants/Servant_Impl_Base.cpp (lookup_facet):
Log an error when we can't find a facet
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/ciao/Servants/Servant_Impl_Base.cpp | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2c2fd85317d..5a5643348ae 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 9 13:54:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Servants/Servant_Impl_Base.cpp (lookup_facet): + Log an error when we can't find a facet + Wed Dec 9 13:53:47 UTC 2009 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp index 785bc481070..6ed205a1e45 100644 --- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp @@ -406,7 +406,7 @@ namespace CIAO Servant_Impl_Base::lookup_facet (const char *port_name) { CIAO_TRACE("Servant_Impl_Base::lookup_facet"); - if (0 == port_name) + if (!port_name) { return CORBA::Object::_nil (); } @@ -416,11 +416,13 @@ namespace CIAO this->lock_, CORBA::NO_RESOURCES ()); - FacetTable::const_iterator iter = - this->facet_table_.find (port_name); + FacetTable::const_iterator iter = this->facet_table_.find (port_name); if (iter == this->facet_table_.end ()) { + CIAO_ERROR ((LM_ERROR, CLINFO + "Servant_Impl_Base::lookup_facet - Found no facet named (%C)\n", + port_name)); return CORBA::Object::_nil (); } @@ -469,8 +471,7 @@ namespace CIAO ::Components::ReceptacleDescription_var safe; ::Components::ReceptacleDescription *rd = 0; - if (this->receptacle_table_.find (receptacle_name, - safe) == -1) + if (this->receptacle_table_.find (receptacle_name, safe) == -1) { CIAO_DEBUG ((LM_DEBUG, CLINFO "Servant_Impl_Base::add_receptacle - Found no receptacle named (%C), creating it...\n", @@ -519,7 +520,7 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "Servant_Impl_Base::add_receptacle - Added new connection to " - "existing receptacle named (%C)\n", + "existing receptacle named (%C)\n", receptacle_name)); } |