diff --git a/server/wsproxy/upstream.cc b/server/wsproxy/upstream.cc index 3de2dab..aee615d 100644 --- a/server/wsproxy/upstream.cc +++ b/server/wsproxy/upstream.cc @@ -58,15 +58,13 @@ void UpStream::UnInit() delete pdelnode; } - #if 0 - f8::Timer::Instance()->DeleteTimer(timer_); - timer_ = nullptr; - #endif + if (!timer_wp_.expired()) { + f8::Timer::Instance()->Delete(timer_wp_); + } tcp_client_->Close(); if(tcp_client_.use_count() != 1) { abort(); } - tcp_client_ = nullptr; recv_bufflen_ = 0; free(recv_buff_); recv_buff_ = nullptr;