[mapguide-commits] r4417 - in trunk/MgDev: Server/src/Common/Manager
UnitTest/WebTier/MapAgent/MapAgentForms Web/src/HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Dec 11 15:06:17 EST 2009
Author: waltweltonlair
Date: 2009-12-11 15:06:16 -0500 (Fri, 11 Dec 2009)
New Revision: 4417
Modified:
trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp
trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/getsitestatusform.html
trunk/MgDev/Web/src/HttpHandler/Makefile.am
Log:
A couple of small merge fixes...
Modified: trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp 2009-12-11 19:43:59 UTC (rev 4416)
+++ trunk/MgDev/Server/src/Common/Manager/ServerManager.cpp 2009-12-11 20:06:16 UTC (rev 4417)
@@ -883,7 +883,7 @@
{
int nOperationQueueCount = -1;
- if(m_pAdminMessageQueue)
+ if(m_pClientMessageQueue)
{
nOperationQueueCount = m_pClientMessageQueue->message_count();
}
@@ -895,7 +895,7 @@
{
int nOperationQueueCount = -1;
- if(m_pAdminMessageQueue)
+ if(m_pSiteMessageQueue)
{
nOperationQueueCount = m_pSiteMessageQueue->message_count();
}
Modified: trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/getsitestatusform.html
===================================================================
--- trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/getsitestatusform.html 2009-12-11 19:43:59 UTC (rev 4416)
+++ trunk/MgDev/UnitTest/WebTier/MapAgent/MapAgentForms/getsitestatusform.html 2009-12-11 20:06:16 UTC (rev 4417)
@@ -13,7 +13,7 @@
<b>Operation:</b>
<input type="text" name="OPERATION" value="GETSITESTATUS" size="50" ID="Text1">
<p> Version:
- <input type="text" name="VERSION" value="2.1.0" size="10" ID="Text2">
+ <input type="text" name="VERSION" value="2.2.0" size="10" ID="Text2">
<p> Locale:
<input type="text" name="LOCALE" value="en" size="10" ID="Text4">
<p> Client Agent:
Modified: trunk/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/Makefile.am 2009-12-11 19:43:59 UTC (rev 4416)
+++ trunk/MgDev/Web/src/HttpHandler/Makefile.am 2009-12-11 20:06:16 UTC (rev 4417)
@@ -85,8 +85,8 @@
HttpGetSchemas.cpp \
HttpGetSessionTimeout.cpp \
HttpGetSiteInfo.cpp \
+ HttpGetSiteStatus.cpp \
HttpGetSiteVersion.cpp \
- HttpGetSiteStatus.cpp \
HttpGetSpatialContexts.cpp \
HttpGetTileImage.cpp \
HttpGetVisibleMapExtent.cpp \
@@ -207,8 +207,8 @@
HttpGetSchemas.h \
HttpGetSessionTimeout.h \
HttpGetSiteInfo.h \
+ HttpGetSiteStatus.h \
HttpGetSiteVersion.h \
- HttpGetSiteStatus.h \
HttpGetSpatialContexts.h \
HttpGetTileImage.h \
HttpGetVisibleMapExtent.h \
More information about the mapguide-commits
mailing list