[mapguide-commits] r4334 - in trunk/MgDev/Common: Geometry/CoordinateSystem MapGuideCommon/Resources

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2009-11-06 16:25:06 -0500 (Fri, 06 Nov 2009)
New Revision: 4334

Modified:
   trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
   trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
Log:
Two minor fixes:
 * Remove an unused error description string from the resource file.
 * Don't guard the call to MgCoordinateSystemFactory::DeleteCatalog.  There's no need for this since the method is only called when the module is unloaded.  It's also called after ACE has already done some uninitialization, and so we don't want to be calling into ACE anymore.


Modified: trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2009-11-06 18:12:36 UTC (rev 4333)
+++ trunk/MgDev/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2009-11-06 21:25:06 UTC (rev 4334)
@@ -170,8 +170,8 @@
 // <returns>Returns nothing</returns>
 void MgCoordinateSystemFactory::DeleteCatalog()
 {
-    ACE_MT (ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance()));
-
+    // there's no need to guard this call - it's only called when the module is unloaded
+//  ACE_MT (ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance()));
     if (sm_pCatalog)
     {
         sm_pCatalog->PrepareForDispose();

Modified: trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res	2009-11-06 18:12:36 UTC (rev 4333)
+++ trunk/MgDev/Common/MapGuideCommon/Resources/mapguide_en.res	2009-11-06 21:25:06 UTC (rev 4334)
@@ -240,7 +240,6 @@
 MgInvalidAgfText                                      = The AGF text is invalid because it failed to parse into a valid geometry object.
 MgInvalidArgumentException                            = The argument is invalid.
 MgInvalidCollectionSize                               = The collection is invalid because the size was not what was expected.
-MgInvalidCoordinateSystemException                    = The coordinate system is invalid.
 MgInvalidDateDifference                               = The date is invalid because there cannot be more than a 24 hour difference.
 MgInvalidDataType                                     = The data type is invalid because it is not recognized.
 MgInvalidDay                                          = The day is invalid because it must be between 1 and 31.