[mapserver-commits] r10216 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2010-06-08 16:48:19 -0400 (Tue, 08 Jun 2010)
New Revision: 10216

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwcs.c
Log:
- ensure well formed XML when msWCSGetCapabilities_CoverageOfferingBrief
  returns MS_FAILURE (#3469)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-06-08 16:33:43 UTC (rev 10215)
+++ trunk/mapserver/HISTORY.TXT	2010-06-08 20:48:19 UTC (rev 10216)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- ensure well formed XML when msWCSGetCapabilities_CoverageOfferingBrief
+  returns MS_FAILURE (#3469)
+
 - Fixed msQueryByRect does not use tolerance (#3453)
 
 - Fixed MapScript processTemplate and processQueryTemplate seg fault (#3468)

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2010-06-08 16:33:43 UTC (rev 10215)
+++ trunk/mapserver/mapwcs.c	2010-06-08 20:48:19 UTC (rev 10216)
@@ -744,8 +744,10 @@
 
   for(i=0; i<map->numlayers; i++)
   {
-      if( msWCSGetCapabilities_CoverageOfferingBrief((GET_LAYER(map, i)), params) != MS_SUCCESS )
+      if( msWCSGetCapabilities_CoverageOfferingBrief((GET_LAYER(map, i)), params) != MS_SUCCESS ) {
+          msIO_printf("</ContentMetadata>\n");
           return MS_FAILURE;
+      }
   }
 
   /* done */