[mapserver-commits] r7764 - trunk/mapserver

[svn at osgeo.org]

Author: hobu
Date: 2008-06-29 10:44:06 -0400 (Sun, 29 Jun 2008)
New Revision: 7764

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapsde.c
Log:
fix build error for older ArcSDEs #2665

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-28 16:31:04 UTC (rev 7763)
+++ trunk/mapserver/HISTORY.TXT	2008-06-29 14:44:06 UTC (rev 7764)
@@ -12,6 +12,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- mapsde.c: Check at compile time that we have SE_connection_test_server, 
+  which appears to only be available for ArcSDE 9+ (#2665).
+  
 - mapshape.c: restore old behavior of tiled shapes relative to shapepath
   with new behavior for when shapepath is undefined (#2369)
 
@@ -30,7 +33,7 @@
 - mapsde.c: processing option added to allow using fully qualified names
   for attributes (#2423).           
 
-- mapsde.c: Test that for an active connection before closing it #2498
+- mapsde.c: Test for an active connection before closing it (#2498).
 
 - mapdraw.c: Fixed issue where path following labels were not being drawn if FORCEd. (#2600)
 

Modified: trunk/mapserver/mapsde.c
===================================================================
--- trunk/mapserver/mapsde.c	2008-06-28 16:31:04 UTC (rev 7763)
+++ trunk/mapserver/mapsde.c	2008-06-29 14:44:06 UTC (rev 7764)
@@ -1053,10 +1053,13 @@
   
     /* request a connection and stream from the pool */
     poolinfo = (msSDEConnPoolInfo *)msConnPoolRequest( layer ); 
+
+#ifdef SE_connection_test_server
     /* check the connection */
     if (poolinfo && (SE_connection_test_server(poolinfo->connection, 30) != SE_SUCCESS)) {
         msSDECloseConnection(poolinfo->connection);
     }
+#endif
   
     /* If we weren't returned a connection and stream, initialize new ones */
     if (!poolinfo) {