[mapguide-commits] r9041 - in branches/2.6/MgDev: . Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-09-19 06:27:57 -0700 (Mon, 19 Sep 2016)
New Revision: 9041

Modified:
   branches/2.6/MgDev/
   branches/2.6/MgDev/Web/src/HttpHandler/HttpGetDynamicMapOverlayImage.cpp
Log:
Merged revision(s) 9038 from trunk/MgDev:
#2738: FORMAT is a required parameter for GETDYNAMICMAPOVERLAYIMAGE. So throw if this isn't specified.
........



Property changes on: branches/2.6/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/branches/3.1/MgDev:9026
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942,9019-9020
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980,8996,9000,9004-9006,9021,9028,9034
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/branches/3.1/MgDev:9026
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942,9019-9020
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980,8996,9000,9004-9006,9021,9028,9034,9038

Modified: branches/2.6/MgDev/Web/src/HttpHandler/HttpGetDynamicMapOverlayImage.cpp
===================================================================
--- branches/2.6/MgDev/Web/src/HttpHandler/HttpGetDynamicMapOverlayImage.cpp	2016-09-19 13:27:43 UTC (rev 9040)
+++ branches/2.6/MgDev/Web/src/HttpHandler/HttpGetDynamicMapOverlayImage.cpp	2016-09-19 13:27:57 UTC (rev 9041)
@@ -41,7 +41,18 @@
 
     // Get the requested image format
     m_mapFormat = params->GetParameterValue(MgHttpResourceStrings::reqRenderingFormat);
+    
+    // Format is required. Throw if not given
+    if (m_mapFormat.empty())
+    {
+        MgStringCollection arguments;
+        arguments.Add(MgHttpResourceStrings::reqRenderingFormat);
+        arguments.Add(MgResources::BlankArgument);
 
+        throw new MgInvalidArgumentException(L"MgHttpGetDynamicMapOverlayImage.MgHttpGetDynamicMapOverlayImage",
+            __LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
+    }
+
     INT32 version = m_userInfo->GetApiVersion();
     if (version == MG_API_VERSION(1,0,0))
     {