diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-01-22 20:22:11 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-01-22 20:22:11 +0000 |
| commit | 93c74e8bbbbb31fc88001ee3edd3cb96e4be829a (patch) | |
| tree | 177adc594d228735893d4e4b5d515858f0fe4801 | |
| parent | 2c33f4d0cec9150cc7a3949ac55a78637aa81979 (diff) | |
| download | ATCD-93c74e8bbbbb31fc88001ee3edd3cb96e4be829a.tar.gz | |
ChangeLogTag: Wed Jan 22 14:56:22 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/Invocation.cpp | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 481c27c09ce..6800115a172 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,14 @@ +Wed Jan 22 14:56:22 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/Invocation.cpp (invoke_i): Unbind the dispatcher instead of + setting the state in the Bind_Dispatcher_Guard. Improves code + readability. + Wed Jan 22 11:08:57 2003 Chris Cleeland <cleeland_c@ociweb.com> * tao/Messaging/Messaging_Policy_i.cpp (hook): Fixed debug message - so that it actually printed out milliseconds rather than the - microsecond component expressed as milliseconds. + so that it actually printed out milliseconds rather than the + microsecond component expressed as milliseconds. Wed Jan 22 17:03:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 75cbe6ec6c0..7e8d96c8beb 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -685,16 +685,12 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request ACE_CHECK_RETURN (reply_error); } - // If this is still an error that needs special handing, call the - // ORB Core which would check whether we need to really - // raise an exception or are we going to base our decision on the - // loaded services. + // If this is still an error that needs other handlers to be used , + // call the ORB Core which can take care of the rest.. if (reply_error == -1) { - // An error has occured while waiting for the reply. So reset the - // state of the dispatcher guard so that no unbind happens when - // the destructor is called. - (void) dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND); + // Just unbind the dispatcher before we take any action. + (void) dispatch_guard.unbind_dispatcher (); return this->orb_core_->service_raise_comm_failure (this, this->profile_ ACE_ENV_ARG_PARAMETER); |