check that we have reached last row before attempintg another fetch

MapServer · Aug 22, 2012 · bc4ccf0 · bc4ccf0 · regiodata · Oct 22, 2012
1 parent 5f9e272
commit bc4ccf0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/maporaclespatial.c b/maporaclespatial.c
@@ -2148,6 +2148,9 @@ int msOracleSpatialLayerNextShape( layerObj *layer, shapeObj *shape )
   do {
     /* is buffer empty? */
     if (sthand->row >= sthand->rows_fetched) {
+      if (sthand->row_num >= sthand->rows_count)
+        return MS_DONE;
+
       /* fetch more */
       success = TRY( hand, OCIStmtFetch2( sthand->stmthp, hand->errhp, (ub4)ARRAY_SIZE, (ub2)OCI_FETCH_NEXT, (sb4)0, (ub4)OCI_DEFAULT ) )
                 && TRY( hand, OCIAttrGet( (dvoid *)sthand->stmthp, (ub4)OCI_HTYPE_STMT, (dvoid *)&sthand->rows_fetched, (ub4 *)0, (ub4)OCI_ATTR_ROWS_FETCHED, hand->errhp ) )
@@ -2160,9 +2163,6 @@ int msOracleSpatialLayerNextShape( layerObj *layer, shapeObj *shape )
       if (!success || sthand->rows_fetched == 0)
         return MS_DONE;
 
-      if (sthand->row_num >= sthand->rows_count)
-        return MS_DONE;
-
       sthand->row = 0; /* reset buffer row index */
     }