diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2005-03-10 05:12:43 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2005-03-10 05:12:43 +0000 |
| commit | 91fefb24a39a6cc8d785a9f9c8faadc010639c75 (patch) | |
| tree | 2c8f5d7a55c48467538b74f2f803be7341f4616c /TAO | |
| parent | 71353fc1328e01365eb9f747a82b2014098519f3 (diff) | |
| download | ATCD-91fefb24a39a6cc8d785a9f9c8faadc010639c75.tar.gz | |
ChangeLogTag:Wed Mar 9 23:04:03 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/Leader_Follower.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/Leader_Follower.h | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 78cd893d3e2..ea92504005e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Mar 9 23:04:03 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Leader_Follower.cpp (wait_for_event): + + Propogate the result of failure of handle_event () to the + application. + + * tao/Leader_Follower.h: + + Added some documention for wait_for_event ()'s return value. + Wed Mar 9 14:20:18 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index 62988b8fbd2..ea4256e9fab 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -420,7 +420,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event," " (leader) exit reactor event loop\n", - t_id)); + result)); } } // @@ -468,12 +468,19 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, } else { - result = 0; + /** + * There should be no reason to reset the value of result + * here. If there was an error in handle_events () that the + * leader saw, I (Bala) thinks it should be propogated to the + * clients. + * result = 0; + */ if (event->error_detected ()) { result = -1; } } + return result; } diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index a32fb10202c..b5ac1d96e5c 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -77,6 +77,8 @@ public: * connection closed. * @param transport The transport attached to the event * @param max_wait_time Limit the time spent on the loop + * @param return Returns -1 on error, 0 or non-zero value + * otherwise. * * @todo Document this better, split the Follower code to the * TAO_LF_Follower class, we probably don't need the transport |