trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch 8.0.x updated: fix crash on shutdown
Date Tue, 26 Jun 2018 16:09:25 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new c4a7011  fix crash on shutdown
c4a7011 is described below

commit c4a701151ed7be635e4567f4633fb48b2181c474
Author: Fei Deng <duke8253@gmail.com>
AuthorDate: Mon Jun 25 16:24:26 2018 -0500

    fix crash on shutdown
    
    (cherry picked from commit abcf7ca3a2feb608a9b1b8ea8ae089002c232b3a)
---
 iocore/net/UnixNetAccept.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
index ed28c8a..898896e 100644
--- a/iocore/net/UnixNetAccept.cc
+++ b/iocore/net/UnixNetAccept.cc
@@ -309,9 +309,13 @@ NetAccept::do_blocking_accept(EThread *t)
       return -1;
     }
 
+    if (shutdown_event_system == true) {
+      return -1;
+    }
+
     // Use 'nullptr' to Bypass thread allocator
     vc = (UnixNetVConnection *)this->getNetProcessor()->allocate_vc(nullptr);
-    if (unlikely(!vc || shutdown_event_system == true)) {
+    if (unlikely(!vc)) {
       return -1;
     }
 


Mime
View raw message