[Libreoffice-commits] core.git: Branch 'feature/cib_contract136' - 2 commits - desktop/source .gitreview

[Libreoffice Gerrit user]

 .gitreview                            |    3 +--
 desktop/source/app/check_ext_deps.cxx |    9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit aa24fb07c7c1bd69d324f363f91dd450aa770bfc
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Oct 18 17:29:08 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Oct 18 17:29:08 2018 +0200

    Update .gitreview
    
    Change-Id: I8405b7a6f7003bc8038bcca255adddbba3a0c094

diff --git a/.gitreview b/.gitreview
index 309e5891a593..0281dddb97fc 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-5-2-7
-
+defaultbranch=feature/cib_contract136
commit 08479f6e23d49411a501f5d47df6a4f09c7306cf
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Oct 18 16:44:57 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Oct 18 17:27:32 2018 +0200

    Sync extension registration on startup
    
    There are cases where the extension registration becomes invalid
    (empty rdb files) which leads to extensions not starting up,
    although installed and active.
    Syncing extension repos on startup fixes that.
    
    The performance impact is negligible (1ms in my measurements).
    
    Change-Id: I10475ce6a054b43c4591b17a8486648ca6a30068
    (cherry picked from commit 44ead855a3df5a0f4f383d8b8d26794686c50119)

diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index ad5d077c6d33..6884c3ffd2dc 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -428,9 +428,12 @@ void Desktop::SynchronizeExtensionRepositories()
                 silent->getInteractionHandler());
 #endif
     } else {
-        // reinstallDeployedExtensions above already calls syncRepositories
-        // internally:
-        dp_misc::syncRepositories(false, silent);
+        // reinstallDeployedExtensions above already calls syncRepositories internally
+
+        // Force syncing repositories on startup. There are cases where the extension
+        // registration becomes invalid which leads to extensions not starting up, although
+        // installed and active. Syncing extension repos on startup fixes that.
+        dp_misc::syncRepositories(/*force=*/true, silent);
     }
 }