diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2010-06-30 09:25:54 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2010-06-30 09:25:54 +0000 |
| commit | 90354fdfab082847d9b54403ed5eb0d86ddf8fa9 (patch) | |
| tree | 4ff1443bb387b964c319b5fac58c866317d69437 | |
| parent | e36b1a423a662e7241c92771736181bd69c0ebef (diff) | |
| download | ATCD-90354fdfab082847d9b54403ed5eb0d86ddf8fa9.tar.gz | |
Wed Jun 30 09:20:10 UTC 2010 Martin Corino <mcorino@remedy.nl>
* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
Cosmetic logging change.
* DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h:
Fixed incorrect Compare functor for server registry set.
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index d0815d2b3bd..edff33bd9e3 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 30 09:20:10 UTC 2010 Martin Corino <mcorino@remedy.nl> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + Cosmetic logging change. + + * DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h: + Fixed incorrect Compare functor for server registry set. + Wed Jun 30 06:04:09 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index e1b71fd9609..46f3709c8a8 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -690,7 +690,7 @@ DAM_NM_ReplyHandlerImpl::Counter::on_all_completed () { DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("DAM_NM_ReplyHandlerImpl::Counter::on_all_completed - ") - ACE_TEXT("Successfully prepared plan: %C\n"), + ACE_TEXT("Successfully completed operation for plan: %C\n"), this->dam_servant_->getPlanUUID ())); this->em_ch_ptr_->handle_completion (dam_servant_.in ()); @@ -701,12 +701,12 @@ DAM_NM_ReplyHandlerImpl::Counter::on_all_completed_with_failure () { DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAM_NM_ReplyHandlerImpl::Counter::on_all_completed_with_failure - ") - ACE_TEXT("%u errors preparing plan: %C\n"), + ACE_TEXT("%u errors for plan: %C\n"), this->fail_count (), this->dam_servant_->getPlanUUID ())); std::ostringstream err; - err << this->fail_count () << " errors preparing plan:\n"; + err << this->fail_count () << " errors executing operation:\n"; for (DAM_NM_ReplyHandlerImpl::Counter::errors_type::const_iterator it = this->errors ().begin (); it != this->errors ().end (); ++it) diff --git a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h index 7bd9725fcc2..033fa0d7936 100644 --- a/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h +++ b/CIAO/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h @@ -129,7 +129,7 @@ namespace DAnCE { bool operator() (const Safe_Server_Info &a, const Safe_Server_Info &b) const { - return a->uuid_ == b->uuid_; + return a->uuid_ < b->uuid_; } }; |