[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

[Andras Timar]

 loolwsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aaa12d7258c1389d211749581f02c486c1e99357
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jun 21 16:15:31 2016 +0200

    loolwsd: avoid NotFoundException when per_document.max_concurrency is missing (old config)
    
    (cherry picked from commit bc4633a2a13e3608f71cd558fca5625d4cd711b7)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index a37b3f4..1119d55 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1258,7 +1258,7 @@ void LOOLWSD::initialize(Application& self)
         NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 1);
     }
 
-    const auto maxConcurrency = config().getInt("per_document.max_concurrency");
+    const auto maxConcurrency = config().getInt("per_document.max_concurrency", 4);
     if (maxConcurrency > 0)
     {
         setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);