diff options
| author | Steve Huston <shuston@riverace.com> | 2010-03-04 12:16:13 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-03-04 12:16:13 +0000 |
| commit | d3962557663a58a97e81cacc5765ed19605972bc (patch) | |
| tree | 9cea5d2588e29e2a1b2a0b18a51c8e7d3adc0cd3 | |
| parent | 826c8710fc5052183c04b7822d95d0c717ed5aa2 (diff) | |
| download | ATCD-d3962557663a58a97e81cacc5765ed19605972bc.tar.gz | |
ChangeLogTag:Tue Mar 2 21:02:51 UTC 2010 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Dev_Poll_Reactor.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6a3c233bfc5..1b42a357447 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 2 21:02:51 UTC 2010 Steve Huston <shuston@riverace.com> + + * ace/Dev_Poll_Reactor.cpp (mask_ops_i): If the specified handle is + not registered, return -1 instead of crashing. + Thu Mar 4 09:15:54 UTC 2010 Martin Corino <mcorino@remedy.nl> * bin/make_release.py: diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 66a0a1ef19c..035d6b17db0 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -2311,14 +2311,13 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops_i"); - if (!this->handler_rep_.handle_in_range (handle)) + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0) return -1; // Block out all signals until method returns. ACE_Sig_Guard sb; - Event_Tuple *info = this->handler_rep_.find (handle); - ACE_Reactor_Mask const old_mask = info->mask; ACE_Reactor_Mask new_mask = old_mask; |