avoid destroy() w/ lock

2018-03-22 13:39:04 -07:00
parent e9cc8298a6
commit 3b53e81f2f
1 changed files with 4 additions and 3 deletions
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -2043,12 +2043,13 @@ void ServerMonitorRequesterImpl::destroy()
        // asCheck
        _channel->getChannelSecuritySession()->release(_ioid);

-        if (_channelMonitor)
-        {
-            _channelMonitor->destroy();
+        if (_channelMonitor) {
            _channelMonitor.reset();
        }
    }
+    if(monitor) {
+        monitor->destroy();
+    }
 }

 Monitor::shared_pointer ServerMonitorRequesterImpl::getChannelMonitor()