trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wei...@apache.org
Subject git commit: TS-1501: fix the bug that mistaken the read as write of netvc. thanks zwoop for pointing it out.
Date Mon, 05 Aug 2013 06:08:12 GMT
Updated Branches:
  refs/heads/master c6d0fe0e6 -> f653a34c8


TS-1501: fix the bug that mistaken the read as write of netvc.
         thanks zwoop for pointing it out.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f653a34c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f653a34c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f653a34c

Branch: refs/heads/master
Commit: f653a34c8166f4f387e1a5b486a58b88da73a85c
Parents: c6d0fe0
Author: weijin <taorui.wj@taobao.com>
Authored: Mon Aug 5 14:04:38 2013 +0800
Committer: weijin <taorui.wj@taobao.com>
Committed: Mon Aug 5 14:06:51 2013 +0800

----------------------------------------------------------------------
 iocore/net/P_UnixNetVConnection.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f653a34c/iocore/net/P_UnixNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index cc434cd..ac1eca9 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -325,7 +325,7 @@ UnixNetVConnection::set_active_timeout(ink_hrtime timeout)
         active_timeout = thread->schedule_in(this, active_timeout_in);
     } else if (write.enabled) {
       ink_assert(write.vio.mutex->thread_holding == this_ethread() && thread);
-      if (read.vio.mutex->thread_holding == thread)
+      if (write.vio.mutex->thread_holding == thread)
         active_timeout = thread->schedule_in_local(this, active_timeout_in);
       else
         active_timeout = thread->schedule_in(this, active_timeout_in);


Mime
View raw message