diff options
| author | Steve Huston <shuston@riverace.com> | 2006-04-11 14:17:01 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2006-04-11 14:17:01 +0000 |
| commit | 172657f35b6ba4878ef2e8c0b3ccc1b968af5f56 (patch) | |
| tree | 759d320be4615ed07143da1ab0ce0ed3e31b446b | |
| parent | 339d46f0be8c3fea05f0081a982ba884cfe3bb31 (diff) | |
| download | ATCD-172657f35b6ba4878ef2e8c0b3ccc1b968af5f56.tar.gz | |
ChangeLogTag:Tue Apr 11 14:10:00 UTC 2006 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ASNMP/asnmp/transaction.cpp | 15 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | THANKS | 1 |
3 files changed, 16 insertions, 8 deletions
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp index d9085d5bf58..2f29cf79544 100644 --- a/ASNMP/asnmp/transaction.cpp +++ b/ASNMP/asnmp/transaction.cpp @@ -122,19 +122,18 @@ int transaction::handle_input (ACE_HANDLE) delete [] (char*) receive_iovec_.iov_base; reset_receive_buffer(receive_iovec_); int rc = session_.recv(&receive_iovec_, receive_addr_, 0); - if (rc == -1) { + if (rc == -1) + { delete [] (char*) receive_iovec_.iov_base; reset_receive_buffer(receive_iovec_); if (result_) - result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL); + result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL); return SNMP_CLASS_RESOURCE_UNAVAIL; - } + } if (result_) - { - result_->result(this, rc); - return 0; - } - return rc; + result_->result(this, rc); + + return 0; } int transaction::handle_timeout(const ACE_Time_Value &, diff --git a/ChangeLog b/ChangeLog index a1dd6e37150..2665f02c728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Apr 11 14:10:00 UTC 2006 Steve Huston <shuston@riverace.com> + + * ASNMP/asnmp/transaction.cpp (handle_input): Return 0 on successful + socket read, not the number of bytes. Thanks to Jason Zhang for this + fix. + + * THANKS: Added Jason Zhang to the Hall of Fame. + Tue Apr 11 13:12:36 UTC 2006 Simon McQueen <sm@prismtech.com> * ace/Lib_Find.h: @@ -2098,6 +2098,7 @@ Ignacio Alvarez <support at xentient dot com> Sergey Zubarev <sergant128 at mail dot ru> Qingbo Cai <qingbo dot cai at case dot edu> David White <david dot white dot 7 at gmail dot com> +Jason Zhang <zzm9981 at 163.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile |