summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuangming <huangminghuang@users.noreply.github.com>2003-11-24 18:56:27 +0000
committerhuangming <huangminghuang@users.noreply.github.com>2003-11-24 18:56:27 +0000
commitab491aef6976442ff1ee23a9368f72cbdf8e6d95 (patch)
treede762cd76dfcad568c69d2b326b1fb53334fd35d
parent472a4b49d5bfdd79c60f4b8e01ee5c83cda4272f (diff)
downloadATCD-ab491aef6976442ff1ee23a9368f72cbdf8e6d95.tar.gz
*** empty log message ***
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp7
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 99f7b816696..f27830b9928 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -40,10 +40,9 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
else if (seq_no != this->sequence_num_+1) {
// out of sync, we missed some set_update() request already
// throw exception
- // client_interceptor_->sequence_num_--;
FTRT::OutOfSequence exception;
exception.current = this->sequence_num_;
- TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence\n");
+ TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_);
ACE_THROW(FTRT::OutOfSequence(exception));
}
else
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 68439bc8b86..6b522df1412 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -188,11 +188,16 @@ void TAO_FTEC_Group_Manager::add_member (
new_impl->info_list.length(new_impl->my_position+2);
new_impl->info_list[new_impl->my_position+1] = info;
- group_info =
+ /// group_info = publisher->set_info(..) should be enough.
+ /// However, GCC 2.96 is not happy with that.
+
+ GroupInfoPublisherBase::Info_ptr group_info1 =
publisher->setup_info(new_impl->info_list,
new_impl->my_position
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
+ group_info.reset(group_info1.release());
+
last_one = true;
}
ACE_ENDTRY;