[mapserver-commits] r9358 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-09-30 18:40:19 -0400 (Wed, 30 Sep 2009)
New Revision: 9358

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maporaclespatial.c
Log:
Applied JimK's most recent SDO patch. (#3069)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-09-30 20:18:09 UTC (rev 9357)
+++ trunk/mapserver/HISTORY.TXT	2009-09-30 22:40:19 UTC (rev 9358)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed a couple of issues with Oracle Spatial and single pass queries (#3069)
+
 - Fixed query maps under the new single pass query process (#3069)
 
 - WFS Client seg fault (OGR layer not opened) (#3136)

Modified: trunk/mapserver/maporaclespatial.c
===================================================================
--- trunk/mapserver/maporaclespatial.c	2009-09-30 20:18:09 UTC (rev 9357)
+++ trunk/mapserver/maporaclespatial.c	2009-09-30 22:40:19 UTC (rev 9358)
@@ -616,6 +616,8 @@
 /* disconnect from database */
 static void msOCICloseHandlers( msOracleSpatialHandler *hand )
 {
+    if (hand->envhp != NULL && hand->errhp != NULL && hand->svchp != NULL)
+        OCICacheFree (hand->envhp,hand->errhp,hand->svchp);
     if (hand->svchp != NULL)
         OCILogoff( hand->svchp, hand->errhp );
     if (hand->errhp != NULL)
@@ -1853,11 +1855,6 @@
         msOCICloseDataHandlers( layerinfo->oradatahandlers );
         layerinfo->oradatahandlers = NULL;
 
-        /* Release Oracle Cache */
-        if (layer->debug)
-          msDebug("msOracleSpatialLayerClose. Cleaning Oracle Cache.\n");
-        OCICacheFree (layerinfo->orahandlers->envhp,layerinfo->orahandlers->errhp,layerinfo->orahandlers->svchp);
-
         /* Release Mapserver Pool */
         if (layer->debug)
           msDebug("msOracleSpatialLayerClose. Release the Oracle Pool.\n");