[mapserver-commits] r10696 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-10-30 11:03:00 -0700 (Sat, 30 Oct 2010)
New Revision: 10696

Modified:
   trunk/mapserver/mapogcsos.c
Log:
mark errors converted to SOS exceptions as reported (#3571)

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2010-10-30 13:27:55 UTC (rev 10695)
+++ trunk/mapserver/mapogcsos.c	2010-10-30 18:03:00 UTC (rev 10696)
@@ -117,6 +117,17 @@
   xmlFree(buffer);
   xmlFreeDoc(psDoc);
 
+  /* 
+  ** The typical pattern is to call msSOSException() right after 
+  ** msSetError().  In order to prevent mapserv.c from re-reporting this
+  ** error at a higher level, we mark it as reported here. #3571
+  */
+  {
+      errorObj *err = msGetErrorObj();
+      if( err != NULL && err->code != MS_NOERR )
+          err->isreported = MS_TRUE;
+  }
+
   return MS_FAILURE;
 }