[mapserver-commits] r10533 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-09-29 16:30:43 +0000 (Wed, 29 Sep 2010)
New Revision: 10533

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maplayer.c
Log:
backport in branch 5.6: Fixed crash when drawing a map using UNIQUE fid in the layer data (#3271)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-09-28 21:40:49 UTC (rev 10532)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-09-29 16:30:43 UTC (rev 10533)
@@ -14,6 +14,8 @@
 Current Version
 ---------------
 
+- Fixed crash when drawing a map using UNIQUE fid in the layer data (#3271)
+
 - Fixed Oracle Spatial Data gets corrupt (#3541)
 
 - Fixed issue with multiple styles and binding (#3538)

Modified: branches/branch-5-6/mapserver/maplayer.c
===================================================================
--- branches/branch-5-6/mapserver/maplayer.c	2010-09-28 21:40:49 UTC (rev 10532)
+++ branches/branch-5-6/mapserver/maplayer.c	2010-09-29 16:30:43 UTC (rev 10533)
@@ -367,6 +367,11 @@
     if (rv != MS_SUCCESS) return rv;
   }
 
+   /* force get_all=MS_TRUE in some cases */
+  if(layer->connectiontype == MS_INLINE || layer->connectiontype == MS_SDE ||
+     (layer->connectiontype == MS_ORACLESPATIAL && layer->data && msCaseFindSubstring(layer->data, "UNIQUE")))
+      get_all=MS_TRUE;
+
   /* cleanup any previous item selection */
   msLayerFreeItemInfo(layer);
   if(layer->items) {