[mssql] Fix debug noise when reading features with null geometry

qgis · Oct 4, 2018 · f6ecc8c · f6ecc8c
1 parent af0ddb6
commit f6ecc8c
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -330,24 +330,19 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature &feature )
 
     feature.setId( mQuery->record().value( mSource->mFidColName ).toLongLong() );
 
+    feature.clearGeometry();
     if ( mSource->isSpatial() )
     {
       QByteArray ar = mQuery->record().value( mSource->mGeometryColName ).toByteArray();
-      unsigned char *wkb = mParser.ParseSqlGeometry( ( unsigned char * )ar.data(), ar.size() );
-      if ( wkb )
+      if ( !ar.isEmpty() )
       {
-        QgsGeometry g;
-        g.fromWkb( wkb, mParser.GetWkbLen() );
-        feature.setGeometry( g );
+        if ( unsigned char *wkb = mParser.ParseSqlGeometry( ( unsigned char * )ar.data(), ar.size() ) )
+        {
+          QgsGeometry g;
+          g.fromWkb( wkb, mParser.GetWkbLen() );
+          feature.setGeometry( g );
+        }
       }
-      else
-      {
-        feature.clearGeometry();
-      }
-    }
-    else
-    {
-      feature.clearGeometry();
     }
 
     feature.setValid( true );