[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/component_context.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 537c7dcfc1e2a1a8ebd9ef12f5671725c7d5e014
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 4 14:21:45 2016 +0100

    tdf#82775: Don't prematurely dispose single-instance services
    
    ...that happen to be requested concurrently from multiple threads
    
    Change-Id: Icecfb0b8d88c9123064689643eddf90a99d3b1b8
    (cherry picked from commit e83f31724e0f2cd4242e0b398c48578da53cb5c1)
    Reviewed-on: https://gerrit.libreoffice.org/21129
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 1a95f4a..21f7cfd 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -620,7 +620,9 @@ Any ComponentContext::lookupMap( OUString const & rName )
             ret = pEntry->value;
     }
     guard.clear();
-    try_dispose( xInstance );
+    if (ret != xInstance) {
+        try_dispose( xInstance );
+    }
     return ret;
 }