[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Michael Meeks]

 wsd/LOOLWSD.cpp |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 4b7dee56528650e72bbef5bbc06c647c3a79e653
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Apr 5 11:57:11 2017 +0100

    Remove un-used _stop member, and cleanup redundant code.

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e05206c6..763faa1c 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2156,7 +2156,6 @@ class LOOLWSDServer
     const LOOLWSDServer& operator=(LOOLWSDServer&& other) = delete;
 public:
     LOOLWSDServer() :
-        _stop(false),
         _acceptPoll("accept_poll")
     {
     }
@@ -2174,7 +2173,6 @@ public:
 
     void stopPrisoners()
     {
-        PrisonerPoll.stop();
         PrisonerPoll.joinThread();
     }
 
@@ -2188,10 +2186,6 @@ public:
 
     void stop()
     {
-        _stop = true;
-        _acceptPoll.stop();
-        WebServerPoll.stop();
-        SocketPoll::wakeupWorld(); //TODO: Why?
         _acceptPoll.joinThread();
         WebServerPoll.joinThread();
     }
@@ -2201,7 +2195,6 @@ public:
         os << "LOOLWSDServer:\n"
            << "   Ports: server " << ClientPortNumber
            <<          " prisoner " << MasterPortNumber << "\n"
-           << "  stop: " << _stop << "\n"
            << "  TerminationFlag: " << TerminationFlag << "\n"
            << "  isShuttingDown: " << ShutdownRequestFlag << "\n"
            << "  NewChildren: " << NewChildren.size() << "\n"
@@ -2227,8 +2220,6 @@ public:
     }
 
 private:
-    std::atomic<bool> _stop;
-
     class AcceptPoll : public TerminatingPoll {
     public:
         AcceptPoll(const std::string &threadName) :