[mapserver-commits] r7750 - trunk/mapserver

[svn at osgeo.org]

Author: hobu
Date: 2008-06-26 14:23:52 -0400 (Thu, 26 Jun 2008)
New Revision: 7750

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapsde.c
Log:
apply Bart's patch for #2498

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-26 05:22:04 UTC (rev 7749)
+++ trunk/mapserver/HISTORY.TXT	2008-06-26 18:23:52 UTC (rev 7750)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- mapsde.c: Test that for an active connection before closing it #2498
+
 - mapdraw.c: Fixed issue where path following lines were not being drawn if FORCEd. (#2600)
 
 - mapshape.c: Applied patch to make the location of tiled data relative to the

Modified: trunk/mapserver/mapsde.c
===================================================================
--- trunk/mapserver/mapsde.c	2008-06-26 05:22:04 UTC (rev 7749)
+++ trunk/mapserver/mapsde.c	2008-06-26 18:23:52 UTC (rev 7750)
@@ -1051,6 +1051,10 @@
   
     /* request a connection and stream from the pool */
     poolinfo = (msSDEConnPoolInfo *)msConnPoolRequest( layer ); 
+    /* check the connection */
+    if (poolinfo && (SE_connection_test_server(poolinfo->connection, 30) != SE_SUCCESS)) {
+        msSDECloseConnection(poolinfo->connection);
+    }
   
     /* If we weren't returned a connection and stream, initialize new ones */
     if (!poolinfo) {