diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2004-11-29 22:48:41 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2004-11-29 22:48:41 +0000 |
| commit | 0d11ab40694ab051b6323d57b957a520349398be (patch) | |
| tree | e4dabd270f1fe2e244a6a1fd2d5b6bc01e0739fd | |
| parent | 09c3a64f52717dfff608307e6d376236478d15a1 (diff) | |
| download | ATCD-0d11ab40694ab051b6323d57b957a520349398be.tar.gz | |
Mon Nov 29 16:45:00 2004 Huang-Ming Huang <hh1@cse.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a5a15b49fde..707f574db09 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 29 16:45:00 2004 Huang-Ming Huang <hh1@cse.wustl.edu> + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp + Fixed problem when the immediate successor of the primary crashes. Thanks + to Thia Chang Chao <tchangch@dso.org.sg> for reporting the bug. + Mon Nov 29 14:44:16 2004 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/Notify/Admin.h: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 794af13cf6b..21b34516c83 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -91,7 +91,7 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, /// check if sucessor changed size_t successors_length = info_list.length() - my_position -1; - if (successors_length != info_->backups.length()) { + if (successors_length /*!= info_->backups.length() */) { // successor changed, update successor iors.length(successors_length); for (i = 0; i < successors_length; ++i) { @@ -107,16 +107,18 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(0); } + /* else { result->successor = info_->successor; } - + if (!CORBA::is_nil(result->successor.in())) { CORBA::PolicyList_var pols; result->successor->_validate_connection (pols.out ()); } - + */ + // update backups result->backups.length(successors_length); for (i = 0; i < successors_length; ++i) { @@ -124,8 +126,8 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, FtRtecEventChannelAdmin::EventChannel::_narrow( info_list[i+ my_position+1].ior.in() ACE_ENV_ARG_PARAMETER); - CORBA::PolicyList_var pols; - result->backups[i]->_validate_connection (pols.out ()); + //CORBA::PolicyList_var pols; + //result->backups[i]->_validate_connection (pols.out ()); ACE_CHECK_RETURN(0); } return result.release(); |