[mapguide-commits] r8567 - trunk/MgDev/Server/src/Services/Rendering

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-11 03:52:35 -0700 (Wed, 11 Mar 2015)
New Revision: 8567

Modified:
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
#2548: Fix inability to clear selections by calling QUERYMAPFEATURES and omitting both GEOMETRY and FEATUREFILTER parameters. This condition previously resulted in a MgNullArgumentException from MgServerRenderingService::RenderForSelection() which is incorrect. The proper action for such a condition is to return immediately.

Reviewed by Walt Welton-Lair

Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2015-03-10 15:33:47 UTC (rev 8566)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2015-03-11 10:52:35 UTC (rev 8567)
@@ -1424,9 +1424,11 @@
 
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) RenderForSelection(): ** START **\n")));
     CHECKARGUMENTNULL(map, L"MgServerRenderingService.RenderForSelection");
-    if ((NULL == geometry && featureFilter.empty()))
-        throw new MgNullArgumentException(L"MgServerRenderingService.RenderForSelection", __LINE__, __WFILE__, NULL, L"", NULL);
 
+    //No geometry or selection XML = nothing to do.
+    if (geometry == NULL && featureFilter.empty())
+        return;
+
     if (maxFeatures < 0)
     {
         STRING buffer;