[mapserver-commits] r10197 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-06-01 12:44:30 -0400 (Tue, 01 Jun 2010)
New Revision: 10197

Modified:
   branches/branch-5-4/mapserver/maptemplate.c
Log:
Moved an error check on the file stream parameter in result set tag handling to after checking for the tag itself. Doing beforehand was problematic for URL templates that don't use that tag nor are read from a file.

Modified: branches/branch-5-4/mapserver/maptemplate.c
===================================================================
--- branches/branch-5-4/mapserver/maptemplate.c	2010-06-01 09:42:42 UTC (rev 10196)
+++ branches/branch-5-4/mapserver/maptemplate.c	2010-06-01 16:44:30 UTC (rev 10197)
@@ -941,14 +941,14 @@
     return(MS_FAILURE);
   }
 
+  tagStart = findTag(*line, "resultset");
+  if(!tagStart) return(MS_SUCCESS); /* OK, just return; */
+
   if(!stream) {
     msSetError(MS_WEBERR, "Invalid file pointer.", "processResultSetTag()");
     return(MS_FAILURE);
   }
 
-  tagStart = findTag(*line, "resultset");
-  if(!tagStart) return(MS_SUCCESS); /* OK, just return; */
-
   while (tagStart) {  
     /* initialize the tag arguments */
     layerName = NULL;