[mapguide-commits] r7567 - in branches/maestro-4.0.x: Maestro OSGeo.MapGuide.MaestroAPI/SchemaOverrides OSGeo.MapGuide.MaestroAPI.Native

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-06-06 05:46:08 -0700 (Thu, 06 Jun 2013)
New Revision: 7567

Modified:
   branches/maestro-4.0.x/Maestro/changelog.txt
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
Log:
Merge r7563 and r7566 to 4.0.x branch

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2013-06-06 12:29:25 UTC (rev 7566)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2013-06-06 12:46:08 UTC (rev 7567)
@@ -1,4 +1,6 @@
-4.0.5
+ - Fix: Bad image mime types in WMS configuration that could cause MapGuide to throw MgUnclassifiedExceptions
+
+4.0.5
 -----
  - Support Resampling Method in GDAL Feature Source editor
  - Fix: MgCooker command-line ignoring basegroup parameter

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2013-06-06 12:29:25 UTC (rev 7566)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2013-06-06 12:46:08 UTC (rev 7567)
@@ -191,13 +191,13 @@
                             mimeType.InnerText = "image/gif";
                             break;
                         case WmsImageFormat.JPG:
-                            mimeType.InnerText = "image/jpg";
+                            mimeType.InnerText = "image/jpeg"; //NOXLATE
                             break;
                         case WmsImageFormat.PNG:
                             mimeType.InnerText = "image/png";
                             break;
                         case WmsImageFormat.TIF:
-                            mimeType.InnerText = "image/tif";
+                            mimeType.InnerText = "image/tiff"; //NOXLATE
                             break;
                     }
                 }

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs	2013-06-06 12:29:25 UTC (rev 7566)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs	2013-06-06 12:46:08 UTC (rev 7567)
@@ -53,8 +53,15 @@
         {
             if (_reader != null)
             {
-                _reader.Close();
-                _reader.Dispose();
+                try
+                {
+                    _reader.Close();
+                    _reader.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _reader = null;
             }
         }
@@ -64,12 +71,26 @@
             Close();
             if (_agfRw != null)
             {
-                _agfRw.Dispose();
+                try
+                {
+                    _agfRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _agfRw = null;
             }
             if (_wktRw != null)
             {
-                _wktRw.Dispose();
+                try
+                {
+                    _wktRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _wktRw = null;
             }
             base.Dispose();

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs	2013-06-06 12:29:25 UTC (rev 7566)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs	2013-06-06 12:46:08 UTC (rev 7567)
@@ -68,12 +68,26 @@
             Close();
             if (_agfRw != null)
             {
-                _agfRw.Dispose();
+                try
+                {
+                    _agfRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _agfRw = null;
             }
             if (_wktRw != null)
             {
-                _wktRw.Dispose();
+                try
+                {
+                    _wktRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _wktRw = null;
             }
             base.Dispose();
@@ -83,8 +97,15 @@
         {
             if (_reader != null)
             {
-                _reader.Close();
-                _reader.Dispose();
+                try
+                {
+                    _reader.Close();
+                    _reader.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _reader = null;
             }
         }

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs	2013-06-06 12:29:25 UTC (rev 7566)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs	2013-06-06 12:46:08 UTC (rev 7567)
@@ -51,12 +51,26 @@
             Close();
             if (_agfRw != null)
             {
-                _agfRw.Dispose();
+                try
+                {
+                    _agfRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _agfRw = null;
             }
             if (_wktRw != null)
             {
-                _wktRw.Dispose();
+                try
+                {
+                    _wktRw.Dispose();
+                }
+                catch (MgException ex)
+                {
+                    ex.Dispose();
+                }
                 _wktRw = null;
             }
             base.Dispose();
@@ -83,7 +97,14 @@
 
         public override void Close()
         {
-            _reader.Close();
+            try
+            {
+                _reader.Close();
+            }
+            catch (MgException ex)
+            {
+                ex.Dispose();
+            }
         }
 
         public override string GetName(int index)