[mapserver-commits] r9156 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-07-09 09:14:50 -0400 (Thu, 09 Jul 2009)
New Revision: 9156

Modified:
   trunk/mapserver/maplayer.c
Log:
Fixed msLayerWhichItems() not to return MS_FAILURE if an inline layer has no items. Probably still needs additional work...

Modified: trunk/mapserver/maplayer.c
===================================================================
--- trunk/mapserver/maplayer.c	2009-07-08 19:12:34 UTC (rev 9155)
+++ trunk/mapserver/maplayer.c	2009-07-09 13:14:50 UTC (rev 9156)
@@ -352,7 +352,12 @@
   */
 
   rv = msLayerGetItems(layer);
-  if(rv != MS_SUCCESS) return(rv);
+  if(rv != MS_SUCCESS) { 
+    if(layer->connectiontype == MS_INLINE) 
+      return MS_SUCCESS; /* no items fine for inline layers (TODO: re-examine this) */
+    else
+      return rv;
+  }
 
   items = layer->items; /* save for later */
   numitems = layer->numitems;