[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - jurt/com

[Caolán McNamara]

 jurt/com/sun/star/uno/AnyConverter.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4b35f65e24f6665bd8dd96d341758bb15b24ada
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 25 15:09:40 2015 +0000

    coverity#1340230 Dereference before null check
    
    ah!, the original code had a type in it. That's
    why it was refactored to remove the null check.
    
    Now a proper fix for cids: 1326180<->1326190
    
    Change-Id: Iba7fd47c03eb5c157f878e0e297e8688f20ae348
    (cherry picked from commit 8244fc2655e37f178f32d63133edf08def8f62c8)
    Reviewed-on: https://gerrit.libreoffice.org/20179
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java
index 61c8c7e..94542e6 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -621,7 +621,7 @@ public class AnyConverter
                 break;
             case TypeClass.ENUM_value:
                 if (tc == TypeClass.ENUM_value &&
-                    (null == destTClass || destType.equals( type ) /* optional destType */))
+                    (null == destType || destType.equals( type ) /* optional destType */))
                 {
                     return object;
                 }