[mapguide-commits] r8625 - sandbox/adsk/3.0m/Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2015-04-28 21:27:28 -0700 (Tue, 28 Apr 2015)
New Revision: 8625

Modified:
   sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp
   sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h
Log:
Fix ticket: ReadNext method loops when using SqLite database
http://trac.osgeo.org/mapguide/ticket/1996

Modified: sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp
===================================================================
--- sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp	2015-04-28 07:48:03 UTC (rev 8624)
+++ sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp	2015-04-29 04:27:28 UTC (rev 8625)
@@ -38,6 +38,7 @@
     m_fdoReader = FDO_SAFE_ADDREF(fdoReader);
     m_forceIdProps = SAFE_ADDREF(forceIdProps); //This is only passed in for select queries that involve the FDO Join APIs
     m_removeFromPoolOnDestruction = false;
+	m_readerDepleted = false;
 
     // The reader takes ownership of the FDO connection
     m_connection->OwnReader();
@@ -57,6 +58,7 @@
     m_connection = NULL;
     m_fdoReader = NULL;
     m_removeFromPoolOnDestruction = false;
+	m_readerDepleted = false;
 }
 
 //////////////////////////////////////////////////////////////////
@@ -96,6 +98,9 @@
 {
     CHECKNULL(m_fdoReader, L"MgServerFeatureReader.ReadNext");
 
+	if (m_readerDepleted)
+ 		return false;
+
     bool retVal = false;
 
     MG_FEATURE_SERVICE_TRY()
@@ -104,6 +109,9 @@
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerFeatureReader.ReadNext")
 
+	if (!retVal)
+		m_readerDepleted = true;
+
     return retVal;
 }
 
@@ -1157,6 +1165,9 @@
     CHECKNULL((FdoIFeatureReader*)m_fdoReader, L"MgServerFeatureReader.AddFeatures");
     CHECKNULL((MgFeatureSet*)m_featureSet, L"MgServerFeatureReader.AddFeatures");
 
+	if (m_readerDepleted)
+ 		return;
+
     INT32 desiredFeatures = 0;
 
     // Access the class definition
@@ -1184,6 +1195,7 @@
                 if (++desiredFeatures == count)
                     break;
             }
+			m_readerDepleted = true;
         }
         //some providers will throw if ReadNext is called more than once
         catch (FdoException* e)

Modified: sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h
===================================================================
--- sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h	2015-04-28 07:48:03 UTC (rev 8624)
+++ sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h	2015-04-29 04:27:28 UTC (rev 8625)
@@ -575,6 +575,7 @@
     FdoIFeatureReader* m_fdoReader;
     bool m_removeFromPoolOnDestruction;
     Ptr<MgStringCollection> m_forceIdProps;
+	FdoBoolean m_readerDepleted;
 
 CLASS_ID:
     static const INT32 m_cls_id = PlatformBase_FeatureService_FeatureReader;