diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-27 23:02:12 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-27 23:02:12 +0000 |
| commit | f399529008eead24372650cd370708c63eb5e28a (patch) | |
| tree | 418c025424935eeb8a8aa5713db115166776aacb | |
| parent | 164e9e8d5b3d93327085b5de674a0b7f0f3451c5 (diff) | |
| download | ATCD-f399529008eead24372650cd370708c63eb5e28a.tar.gz | |
ChangeLogTag: Tue Mar 27 17:01:13 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/tao/Wait_On_Leader_Follower.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 10c0320822c..535ef2e0da3 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Tue Mar 27 17:01:13 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/Wait_On_Leader_Follower.cpp (wait): Reverted a change to + ACE_TEXT and did as per Darrell's advise. + Tue Mar 27 15:56:49 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Default_Protocols_Hooks.cpp: diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp index cd4f17d0e3a..6355fde2f19 100644 --- a/TAO/tao/Wait_On_Leader_Follower.cpp +++ b/TAO/tao/Wait_On_Leader_Follower.cpp @@ -169,8 +169,8 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - done (follower) " - ACE_TEXT ("on <%x>, reply_received %d\n")), + "TAO (%P|%t) - done (follower) " + "on <%x>, reply_received %d\n", this->transport_, reply_received)); // Now somebody woke us up to become a leader or to handle our @@ -274,7 +274,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, result = -1; errno = ETIME; } - else if (reply_received == -1) + else if (reply_received == -1) { // If the time did not expire yet, but we get a failure, // e.g. the connections closed, we should still return an error. |