[mapguide-commits] r10211 - branches/4.0/MgDev/Server/src/Services/Mapping

[svn_mapguide at osgeo.org]

Author: jng
Date: 2026-09-10 03:17:52 -0700 (Thu, 10 Sep 2026)
New Revision: 10211

Modified:
   branches/4.0/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp
Log:
Fix regression in selection rendering around NULL value handling.

Fixes #2889

Modified: branches/4.0/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp
===================================================================
--- branches/4.0/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp	2026-09-09 14:29:44 UTC (rev 10210)
+++ branches/4.0/MgDev/Server/src/Services/Mapping/RSMgFeatureReader.cpp	2026-09-10 10:17:52 UTC (rev 10211)
@@ -464,6 +464,16 @@
 {
     static const size_t MAX_STRING = 64;
 
+    // A null property value cannot be converted to a string. Return an empty
+    // string instead of letting MgNullPropertyValueException escape, since the
+    // RSFR_TRY/RSFR_CATCH macros no longer translate MgException to FdoException
+    // (see changeset 10158).
+    if (IsNull(propertyName))
+    {
+        m_cachePropValue = L"";
+        return m_cachePropValue.c_str();
+    }
+
     try
     {
         switch (GetPropertyType(propertyName))
@@ -553,7 +563,15 @@
         //to put into DWF
         m_cachePropValue = L"";
     }
+    catch (MgException* e)
+    {
+        e->Release();
 
+        //value is likely null in the provider, so just use empty string
+        //to put into DWF
+        m_cachePropValue = L"";
+    }
+
     return m_cachePropValue.c_str();
 }