[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - javaunohelper/source

[Caolán McNamara]

 javaunohelper/source/javaunohelper.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b453342413fddbc808c39f5edd8b19ed49fff05d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 11 17:37:29 2015 +0000

    coverity#1338592 Explicit null dereferenced
    
    Change-Id: Ief5c2effbddebe29fc7a4d38ed0af4fed72de40e
    (cherry picked from commit e08fbe4c592b25fb88828157ff054431ac8e2d8b)
    Reviewed-on: https://gerrit.libreoffice.org/19915
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index d91a081..145a753 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -69,8 +69,6 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
     if (lib.is())
     {
-        lib.release();
-
         // ========================= LATEST VERSION =========================
         OUString aGetEnvName( COMPONENT_GETENV );
         oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName);
@@ -126,6 +124,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                 }
             }
         }
+        lib.release();
     }
 #endif
     return bRet ? JNI_TRUE : JNI_FALSE;
@@ -161,8 +160,6 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
     if (lib.is())
     {
-        lib.release();
-
         // ========================= LATEST VERSION =========================
         OUString aGetEnvName( COMPONENT_GETENV );
         oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName);
@@ -232,6 +229,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                 }
             }
         }
+        lib.release();
     }
 #endif
     return joSLL_cpp;