[mapguide-commits] r8687 - branches/2.6/MgDev/Server/src/Services/Feature
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jun 4 07:05:53 PDT 2015
Author: jng
Date: 2015-06-04 07:05:53 -0700 (Thu, 04 Jun 2015)
New Revision: 8687
Modified:
branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp
branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.h
Log:
Merged revision(s) 8682 from trunk/MgDev:
Revert submission r8626 as it caused a regression bug. This bug is fixed in FDO part, so revert MapGuide fixing.
........
Modified: branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp
===================================================================
--- branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp 2015-06-04 14:02:37 UTC (rev 8686)
+++ branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp 2015-06-04 14:05:53 UTC (rev 8687)
@@ -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: branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.h
===================================================================
--- branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.h 2015-06-04 14:02:37 UTC (rev 8686)
+++ branches/2.6/MgDev/Server/src/Services/Feature/ServerFeatureReader.h 2015-06-04 14:05:53 UTC (rev 8687)
@@ -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;
More information about the mapguide-commits
mailing list