diff options
| author | msmit <msmit@remedy.nl> | 2009-09-03 12:03:21 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-09-03 12:03:21 +0000 |
| commit | 03814ca2d7de820286ce6061586bdfffda79f816 (patch) | |
| tree | 4f815e216b147063392a160a5227988fd848a1a7 | |
| parent | 785becb614db2610f9678c8c7be2eaf078549980 (diff) | |
| download | ATCD-03814ca2d7de820286ce6061586bdfffda79f816.tar.gz | |
Thu Sep 3 12:05:43 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp:
rebind (in stead of bind) is always called.
This results in an unnecessary warning.
* ciao/Containers/Servant_Activator.cpp:
tmp was initialized but never used.
| -rw-r--r-- | modules/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | modules/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp | 14 | ||||
| -rw-r--r-- | modules/CIAO/ciao/Containers/Servant_Activator.cpp | 5 |
3 files changed, 17 insertions, 11 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 673e45c650b..6f6fd9db1c9 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Sep 3 12:05:43 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: + rebind (in stead of bind) is always called. + This results in an unnecessary warning. + + * ciao/Containers/Servant_Activator.cpp: + tmp was initialized but never used. + Thu Sep 3 10:20:48 UTC 2009 Marcel Smit <msmit@remedy.nl> * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: diff --git a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp index a8a94c8ce1d..9185a03cd3d 100644 --- a/modules/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp +++ b/modules/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp @@ -25,19 +25,17 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentInstallation_Impl::install - " "implUUID %s, component_loc %s\n", implUUID, component_loc)); - - ACE_CString location = component_loc; - if (0 == this->locations_.find (implUUID)) + if (-1 == this->locations_.find (implUUID)) { - this->locations_.bind (implUUID, location); + this->locations_.bind (implUUID, component_loc); } else { - CIAO_ERROR ((LM_WARNING, CLINFO "ComponentInstallation_Impl::install - Location for artifact %s " - "already present, replacing.\n", - implUUID)); - this->locations_.rebind (implUUID, location); + CIAO_ERROR ((LM_WARNING, CLINFO "ComponentInstallation_Impl::install - Location for artifact %s, component_loc %s" + " already present, replacing.\n", + implUUID, component_loc)); + this->locations_.rebind (implUUID, component_loc); } } diff --git a/modules/CIAO/ciao/Containers/Servant_Activator.cpp b/modules/CIAO/ciao/Containers/Servant_Activator.cpp index ac72f7f4f63..21aad8bf80d 100644 --- a/modules/CIAO/ciao/Containers/Servant_Activator.cpp +++ b/modules/CIAO/ciao/Containers/Servant_Activator.cpp @@ -134,7 +134,6 @@ namespace CIAO PortableServer::ObjectId_to_string (oid); size_t const sz = this->slot_index_; - Port_Activator *tmp = 0; for (size_t t = 0; t != sz; ++t) { @@ -146,14 +145,14 @@ namespace CIAO continue; } - if (tmp == 0) + if (pa == 0) { CIAO_ERROR ((LM_WARNING, CLINFO "Servant_Activator_i::etherealize - Port Activator is NULL\n")); continue; } - if (ACE_OS::strcmp (tmp->oid (), + if (ACE_OS::strcmp (pa->oid (), str.in ()) == 0) { CIAO_DEBUG ((LM_INFO, CLINFO |