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

[Henry Castro]

 loolwsd/LOOLWSD.cpp |    5 -----
 loolwsd/LOOLWSD.hpp |    1 -
 2 files changed, 6 deletions(-)

New commits:
commit e3fd07ad0e72bb035f1a1a4d8e18523fae49aad8
Author: Henry Castro <hcas...@collabora.com>
Date:   Mon Jan 25 12:26:22 2016 -0400

    loolwsd: remove unnecessary inter process mutex
    
    It is no longer needed becuase loolbroker handle connections

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bbb4c84..cd6a89c 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -729,7 +729,6 @@ std::string LOOLWSD::LoTemplate;
 std::string LOOLWSD::ChildRoot;
 std::string LOOLWSD::JailId;
 std::string LOOLWSD::LoSubPath = "lo";
-Poco::NamedMutex LOOLWSD::NamedMutexLOOL("loolwsd");
 
 int LOOLWSD::NumPreSpawnedChildren = 10;
 bool LOOLWSD::DoTest = false;
@@ -948,8 +947,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
         return Application::EXIT_UNAVAILABLE;
     }
 
-    NamedMutexLOOL.lock();
-
     JailId = Util::createRandomDir(ChildRoot);
     if (!createBroker(JailId))
     {
@@ -986,8 +983,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
         return Application::EXIT_UNAVAILABLE;
     }
 
-    NamedMutexLOOL.unlock();
-
     TestInput input(*this, svs, srv);
     Thread inputThread;
     if (LOOLWSD::DoTest)
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 0e8e798..00c9b09 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -162,7 +162,6 @@ public:
     static std::string ChildRoot;
     static std::string JailId;
     static std::string LoSubPath;
-    static Poco::NamedMutex NamedMutexLOOL;
 
     static const std::string CHILD_URI;
     static const std::string PIDLOG;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits