[mapguide-commits] r6140 - in trunk/MgDev/Server/src: Common/Manager Core

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2011-09-21 02:56:04 -0700 (Wed, 21 Sep 2011)
New Revision: 6140

Modified:
   trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
   trunk/MgDev/Server/src/Core/serverconfig.ini
Log:
Fix ticket http://trac.osgeo.org/mapguide/ticket/1793
AIMS hang when foreign WMS is not available anymore
FDOConnectionTimeoutCustom is second, and FdoConnectionTimeout is millisecond. The value read from serverconfig.ini should multiple 1000.
This submission also fixed one typo in serverconfig.ini comment.

Modified: trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp	2011-09-21 05:43:58 UTC (rev 6139)
+++ trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp	2011-09-21 09:56:04 UTC (rev 6140)
@@ -823,7 +823,8 @@
                     }                    
                     if(provider.find(providerName) != STRING::npos && timeoutVal > 0)
                     {
-                        pFdoConnection->SetConnectionTimeout(timeoutVal);
+                        //FDOConnectionTimeoutCustom is second, and FdoConnectionTimeout is millisecond.
+                        pFdoConnection->SetConnectionTimeout(timeoutVal * 1000);
                         break;
                     }
                 }

Modified: trunk/MgDev/Server/src/Core/serverconfig.ini
===================================================================
--- trunk/MgDev/Server/src/Core/serverconfig.ini	2011-09-21 05:43:58 UTC (rev 6139)
+++ trunk/MgDev/Server/src/Core/serverconfig.ini	2011-09-21 09:56:04 UTC (rev 6140)
@@ -264,7 +264,7 @@
 # DataTransactionTimerInterval  Time interval in seconds for when the server
 #                                  checks for idle FDO transactions
 #                                       0 < Value <= 1800
-# FDOConnectionTimeout             Time duration in seconds for an FDO connection
+# FDOConnectionTimeoutCustom    Time duration in seconds for an FDO connection
 #                                       0 < Value <= 600
 # *****************************************************************************
 CacheSize                          = 100