fs34c: #i117666# check first if value is null

 * found as LGPLv3-only fix at svn rev 1172125 (http://svn.apache.org/viewvc?view=revision&revision=1172125)

1 files changed, 6 insertions, 4 deletions

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index e467b5507b1d..bfa3b12a520a 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -786,6 +786,12 @@ sal_Bool operator==(const DateTime& _rLH,const DateTime& _rRH)
 
 bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
 {
+    if ( m_bNull != _rRH.isNull() )
+        return false;
+
+    if(m_bNull && _rRH.isNull())
+        return true;
+
     if ( m_eTypeKind != _rRH.m_eTypeKind )
     {
         switch(m_eTypeKind)
@@ -808,10 +814,6 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
             }
         return false;
     }
-    if ( m_bNull != _rRH.isNull() )
-            return false;
-    if(m_bNull && _rRH.isNull())
-        return true;
 
     bool bRet = false;
     OSL_ENSURE(!m_bNull,"SHould not be null!");