You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/03/20 03:19:45 UTC
git commit: interm
Updated Branches:
refs/heads/master 8ea72978b -> b1f2e9843
interm
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b1f2e984
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b1f2e984
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b1f2e984
Branch: refs/heads/master
Commit: b1f2e984379d6dc11cb70136ba33d46527a317d3
Parents: 8ea7297
Author: John Plevyak <jp...@apache.org>
Authored: Mon Mar 19 19:19:31 2012 -0700
Committer: John Plevyak <jp...@acm.org>
Committed: Mon Mar 19 19:19:31 2012 -0700
----------------------------------------------------------------------
iocore/net/UnixNetVConnection.cc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b1f2e984/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index b59294b..30ed932 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -986,7 +986,9 @@ UnixNetVConnection::mainEvent(int event, Event *e)
MUTEX_TRY_LOCK(rlock, read.vio.mutex ? (ProxyMutex *) read.vio.mutex : (ProxyMutex *) e->ethread->mutex, e->ethread);
MUTEX_TRY_LOCK(wlock, write.vio.mutex ? (ProxyMutex *) write.vio.mutex :
(ProxyMutex *) e->ethread->mutex, e->ethread);
- if (!hlock || !rlock || !wlock) {
+ if (!hlock || !rlock || !wlock ||
+ (read.vio.mutex.m_ptr && rlock.m.m_ptr != read.vio.mutex.m_ptr) ||
+ (write.vio.mutex.m_ptr && wlock.m.m_ptr != write.vio.mutex.m_ptr)) {
#ifndef INACTIVITY_TIMEOUT
if (e == active_timeout)
#endif