core.git: Branch 'libreoffice-25-2' - ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/cacher/cachedcontentresultset.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c35ccea8cc9bf53e738f61c8328b4d657a72e10c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Aug 6 09:06:05 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 14 13:07:10 2025 +0200

    cid#1659628 can only reach this line in the case of a caught exception
    
    so move it into that block protected by the rGuard.lock()
    
    Change-Id: I8e0bde5a7de6ec5428b405f734d6c8e54fb1645e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188994
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit a2bbf65bb44229cadd1bc325ef174322b625a36b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189484
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx 
b/ucb/source/cacher/cachedcontentresultset.cxx
index 4a554f7ff768..9fa929cdf343 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -754,9 +754,8 @@ bool CachedContentResultSet
             }
             else
                 throw;
+            return nRow == m_nLastAppliedPos;
         }
-
-        return nRow == m_nLastAppliedPos;
     }
     return true;
 };