Repository: trafficserver Updated Branches: refs/heads/6.1.x a98e59383 -> 9381f6f88
TS-4141: Null check fix. (cherry picked from commit 56109f1c1dbde685cea35051f242d6f7e1c9821c) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9381f6f8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9381f6f8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9381f6f8 Branch: refs/heads/6.1.x Commit: 9381f6f889961adc7fddbea2a796440a975a5bae Parents: a98e593 Author: shinrich <[email protected]> Authored: Sun Jan 17 19:45:04 2016 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Sun Jan 17 21:49:24 2016 -0700 ---------------------------------------------------------------------- proxy/http/HttpSM.cc | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9381f6f8/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index ad27741..7350581 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -5622,6 +5622,9 @@ HttpSM::attach_server_session(HttpServerSession *s) // Propagate the per client IP debugging if (ua_session) s->get_netvc()->control_flags = get_cont_flags(); + else { // If there is no ua_session no sense in continuing to attach the server session + return; + } // Set the mutex so that we have something to update // stats with
