[mapguide-commits] r4275 - trunk/MgDev/Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2009-09-30 17:51:48 -0400 (Wed, 30 Sep 2009)
New Revision: 4275

Modified:
   trunk/MgDev/Server/src/Services/Feature/ServerDataReader.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.h
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
   trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.cpp
Log:
Change internal API name from HasReader() to OwnReader() in order to be more clear on what the method actually does.


Modified: trunk/MgDev/Server/src/Services/Feature/ServerDataReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDataReader.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDataReader.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -35,7 +35,7 @@
     m_removeFromPoolOnDestruction = false;
 
     // The reader takes ownership of the FDO connection
-    m_connection->HasReader();
+    m_connection->OwnReader();
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerDataReader.MgServerDataReader")
 }

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -177,7 +177,7 @@
     return supports;
 }
 
-void MgServerFeatureConnection::HasReader()
+void MgServerFeatureConnection::OwnReader()
 {
     if(! m_bCloseConnection)
         FDO_SAFE_ADDREF(m_fdoConn);

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.h	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureConnection.h	2009-09-30 21:51:48 UTC (rev 4275)
@@ -51,7 +51,7 @@
 
     bool SupportsCommand(INT32 commandType);
 
-    void HasReader();
+    void OwnReader();
 
 private:
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -38,7 +38,7 @@
     m_removeFromPoolOnDestruction = false;
 
     // The reader takes ownership of the FDO connection
-    m_connection->HasReader();
+    m_connection->OwnReader();
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerFeatureReader.MgServerFeatureReader")
 }

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureTransaction.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -30,7 +30,7 @@
     m_lastUsed       = ACE_OS::gettimeofday();
 
     // The transaction takes ownership of the FDO connection
-    m_connection->HasReader();
+    m_connection->OwnReader();
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerFeatureTransaction.MgServerFeatureTransaction")
 }

Modified: trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -1927,7 +1927,7 @@
         MgServerFeatureConnection* conn = (*iter).second;
         if(conn)
         {
-            conn->HasReader();
+            conn->OwnReader();
         }
     }
 }

Modified: trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -1370,7 +1370,7 @@
 
     MG_FEATURE_SERVICE_CHECK_CONNECTION_CATCH_AND_THROW(featureSourceIdentifier, L"MgServerSelectFeatures.JoinFeatures")
 
-    // Now that the reader has been created we will need to mark all of the connections it uses as HasReader() because the GWS reader will be
+    // Now that the reader has been created we will need to mark all of the connections it uses as OwnReader() because the GWS reader will be
     // taking ownership of the connections. We have to do it this late in the code in case an exception is thrown somewhere before this.
     // We want to avoid a deadlock of the connection :)
     gwsFeatureReader->OwnsConnections();

Modified: trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.cpp	2009-09-30 17:43:31 UTC (rev 4274)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.cpp	2009-09-30 21:51:48 UTC (rev 4275)
@@ -33,7 +33,7 @@
     m_providerName = providerName;
 
     // The reader takes ownership of the FDO connection
-    m_connection->HasReader();
+    m_connection->OwnReader();
 
     MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgServerSqlDataReader.MgServerSqlDataReader")
 }