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

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2015-05-27 19:08:22 -0700 (Wed, 27 May 2015)
New Revision: 8683

Modified:
   sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp
   sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h
Log:
Revert submission r8625 as it caused a regression bug. This bug is fixed in FDO part, so revert MapGuide fixing. 

Modified: sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp
===================================================================
--- sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp	2015-05-28 02:06:51 UTC (rev 8682)
+++ sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.cpp	2015-05-28 02:08:22 UTC (rev 8683)
@@ -38,7 +38,6 @@
     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();
@@ -58,7 +57,6 @@
     m_connection = NULL;
     m_fdoReader = NULL;
     m_removeFromPoolOnDestruction = false;
-	m_readerDepleted = false;
 }
 
 //////////////////////////////////////////////////////////////////
@@ -98,9 +96,6 @@
 {
     CHECKNULL(m_fdoReader, L"MgServerFeatureReader.ReadNext");
 
-	if (m_readerDepleted)
- 		return false;
-
     bool retVal = false;
 
     MG_FEATURE_SERVICE_TRY()
@@ -109,9 +104,6 @@
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerFeatureReader.ReadNext")
 
-	if (!retVal)
-		m_readerDepleted = true;
-
     return retVal;
 }
 
@@ -1165,9 +1157,6 @@
     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
@@ -1195,7 +1184,6 @@
                 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-05-28 02:06:51 UTC (rev 8682)
+++ sandbox/adsk/3.0m/Server/src/Services/Feature/ServerFeatureReader.h	2015-05-28 02:08:22 UTC (rev 8683)
@@ -575,7 +575,6 @@
     FdoIFeatureReader* m_fdoReader;
     bool m_removeFromPoolOnDestruction;
     Ptr<MgStringCollection> m_forceIdProps;
-	FdoBoolean m_readerDepleted;
 
 CLASS_ID:
     static const INT32 m_cls_id = PlatformBase_FeatureService_FeatureReader;