[mapguide-commits] r1093 - in trunk/MgDev/Server/src: Gws/GwsCommon/inc Gws/Include Services/Feature

[svn_mapguide at osgeo.org]

Author: ronnielouie
Date: 2007-02-05 16:44:33 -0500 (Mon, 05 Feb 2007)
New Revision: 1093

Modified:
   trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObject.h
   trunk/MgDev/Server/src/Gws/Include/GwsCommon.h
   trunk/MgDev/Server/src/Gws/Include/GwsQueryEngine.h
   trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.cpp
   trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.h
Log:
Changes to Feature Service GWS as a result of recent updates in FDO.

Modified: trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObject.h
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObject.h	2007-02-05 21:05:57 UTC (rev 1092)
+++ trunk/MgDev/Server/src/Gws/GwsCommon/inc/GwsObject.h	2007-02-05 21:44:33 UTC (rev 1093)
@@ -74,18 +74,18 @@
     typedef GWSObjectLock< Interface, ThreadModel >  ThisLock;
 
 
-    virtual void AddRef()
+    virtual FdoInt32 AddRef()
     {
-        InternalAddRef();
-        return;
+        unsigned long l = InternalAddRef();
+        return l;
     }
 
-    virtual void Release()
+    virtual FdoInt32 Release()
     {
         unsigned long l = InternalRelease();
         if (l == 0)
             Dispose();
-        return;
+        return l;
     }
 
     virtual IGWSObject* GetOwner()
@@ -153,22 +153,22 @@
             m_pOwner = pOwner;
     }
 
-    void OwnerAddRef()
+    FdoInt32 OwnerAddRef()
     {
         //ThisLock lock(this);
         if (m_pOwner != NULL)
             return m_pOwner->AddRef();
         else
-            return;
+            return 0;
     }
 
-    void OwnerRelease()
+    FdoInt32 OwnerRelease()
     {
         //ThisLock lock(this);
         if (m_pOwner != NULL)
             return m_pOwner->Release();
         else
-            return;
+            return 0;
     }
     //Note: this implementation AddRef's and Release's the owner
     unsigned long InternalAddRef()

Modified: trunk/MgDev/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- trunk/MgDev/Server/src/Gws/Include/GwsCommon.h	2007-02-05 21:05:57 UTC (rev 1092)
+++ trunk/MgDev/Server/src/Gws/Include/GwsCommon.h	2007-02-05 21:44:33 UTC (rev 1093)
@@ -669,13 +669,13 @@
     /// Increases the reference count on the object.
     /// </summary>
     /// <returns>Returns nothing.</returns>
-    virtual void AddRef() = 0;
+    virtual FdoInt32 AddRef() = 0;
     /// <summary>
     /// Decreases the reference count on the object and disposes of it
     /// when the count is 0.
     /// </summary>
     /// <returns>Returns nothing.</returns>
-    virtual void Release() = 0;
+    virtual FdoInt32 Release() = 0;
 
 protected:
     /// <summary>

Modified: trunk/MgDev/Server/src/Gws/Include/GwsQueryEngine.h
===================================================================
--- trunk/MgDev/Server/src/Gws/Include/GwsQueryEngine.h	2007-02-05 21:05:57 UTC (rev 1092)
+++ trunk/MgDev/Server/src/Gws/Include/GwsQueryEngine.h	2007-02-05 21:44:33 UTC (rev 1093)
@@ -701,8 +701,8 @@
     /// <summary>
     /// disposable interface methods. To avoid ambiquity
     /// </summary>
-    virtual void                AddRef() = 0;
-    virtual void                Release() = 0;
+    virtual FdoInt32                AddRef() = 0;
+    virtual FdoInt32                Release() = 0;
 
     // declarations below are to avoids ambiquity (methods are defined both
     // in IGWSFeature and FdoIFeatureReader)

Modified: trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.cpp	2007-02-05 21:05:57 UTC (rev 1092)
+++ trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.cpp	2007-02-05 21:44:33 UTC (rev 1093)
@@ -53,16 +53,17 @@
     }
 }
 
-void MgGwsConnectionPool::AddRef ()
+FdoInt32 MgGwsConnectionPool::AddRef ()
 {
-    m_iRefCount ++;
+    return m_iRefCount ++;
 }
-void MgGwsConnectionPool::Release ()
+FdoInt32 MgGwsConnectionPool::Release ()
 {
     m_iRefCount --;
     assert (m_iRefCount >= 0);
     if (m_iRefCount == 0)
         Dispose ();
+    return m_iRefCount;
 }
 void MgGwsConnectionPool::Dispose ()
 {

Modified: trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.h	2007-02-05 21:05:57 UTC (rev 1092)
+++ trunk/MgDev/Server/src/Services/Feature/GwsConnectionPool.h	2007-02-05 21:44:33 UTC (rev 1093)
@@ -46,8 +46,8 @@
     static MgGwsConnectionPool* Create();
 
     // IGWSDisposable methods
-    virtual void AddRef();
-    virtual void Release();
+    virtual FdoInt32 AddRef();
+    virtual FdoInt32 Release();
     virtual void Dispose();
 
     // IGWSObject methods