[mapguide-commits] r5616 - trunk/MgDev/Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2011-03-09 08:53:02 -0800 (Wed, 09 Mar 2011)
New Revision: 5616

Modified:
   trunk/MgDev/Common/CoordinateSystem/CoordSysFormatConverter.cpp
Log:
Fix for trac ticket 1600 - Threading error with CodeToWkt() method
http://trac.osgeo.org/mapguide/ticket/1600

Notes:
- Add check for NULL value returned by CSepsg2adskCS()


Modified: trunk/MgDev/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2011-03-09 16:48:58 UTC (rev 5615)
+++ trunk/MgDev/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2011-03-09 16:53:02 UTC (rev 5616)
@@ -468,7 +468,16 @@
             //The mapping from Adsk name to Msi is done internally inside
             //the method CSepsg2adskCS
             CriticalClass.Enter();
-            szMsiName=CSepsg2adskCS(lEpsg);
+            const char* szMsiNameTemp=NULL;
+            szMsiNameTemp=CSepsg2adskCS(lEpsg);
+            if(NULL == szMsiNameTemp)
+            {
+                szMsiName = "";
+            }
+            else
+            {
+                szMsiName = szMsiNameTemp;
+            }
             CriticalClass.Leave();
             if (szMsiName.empty())
             {