From e8937d3a47db6a9ae6a830b10c7044df0cd23182 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 1 Feb 2013 13:58:51 -0500 Subject: [PATCH] regression fix for a mtssrv exception (occurs upon disconnection events) --- src/libcore/sched_remote.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcore/sched_remote.cpp b/src/libcore/sched_remote.cpp index d11e763a..95f737c5 100644 --- a/src/libcore/sched_remote.cpp +++ b/src/libcore/sched_remote.cpp @@ -325,14 +325,7 @@ StreamBackend::StreamBackend(const std::string &thrName, Scheduler *scheduler, m_memStream->setByteOrder(Stream::ENetworkByteOrder); } -StreamBackend::~StreamBackend() { - if (m_stream->getClass()->derivesFrom(MTS_CLASS(SocketStream))) { - SocketStream *sstream = static_cast(m_stream.get()); - Log(EInfo, "Closing connection to %s - received %i KB / sent %i KB", - sstream->getPeer().c_str(), (int) (sstream->getReceivedBytes() / 1024), - (int) (sstream->getSentBytes() / 1024)); - } -} +StreamBackend::~StreamBackend() { } void StreamBackend::run() { if (m_detach) @@ -489,6 +482,13 @@ void StreamBackend::run() { Log(EWarn, "Removing stray resource %i", (*it).first); m_scheduler->unregisterResource((*it).second); } + + if (m_stream->getClass()->derivesFrom(MTS_CLASS(SocketStream))) { + SocketStream *sstream = static_cast(m_stream.get()); + Log(EInfo, "Closing connection to %s - received %i KB / sent %i KB", + sstream->getPeer().c_str(), (int) (sstream->getReceivedBytes() / 1024), + (int) (sstream->getSentBytes() / 1024)); + } } void StreamBackend::sendCancellation(int id, int numLost) {