[mapguide-commits] r7591 - in branches/2.4/MgDev: . Common/Stylization Desktop/MgDesktop/Services Desktop/UnitTest Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 9 08:31:54 PDT 2013
Author: jng
Date: 2013-06-09 08:31:54 -0700 (Sun, 09 Jun 2013)
New Revision: 7591
Modified:
branches/2.4/MgDev/
branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp
branches/2.4/MgDev/Desktop/UnitTest/main.cpp
branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
branches/2.4/MgDev/Web/src/viewerfiles/
branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
Log:
#2279: Backport to 2.4
Property changes on: branches/2.4/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev:7349,7396,7569-7570
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev:7349,7396,7531,7569-7570
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7349,7396,7569-7570
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2013-06-09 15:15:51 UTC (rev 7590)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2013-06-09 15:31:54 UTC (rev 7591)
@@ -451,10 +451,6 @@
{
ReleasePotentialLocks(resource);
- //Empty cached version
- MgdResourceContentCache* cache = MgdResourceContentCache::GetInstance();
- cache->RemoveContentEntry(resource);
-
STRING contentPath = ResolveContentPath(resource);
STRING dataPath = ResolveDataPath(resource);
if (MgFileUtil::IsFile(contentPath))
@@ -494,6 +490,10 @@
void MgdResourceService::ReleasePotentialLocks(MgResourceIdentifier* resource)
{
+ //Empty cached version
+ MgdResourceContentCache* cache = MgdResourceContentCache::GetInstance();
+ cache->RemoveContentEntry(resource);
+
CHECKARGUMENTNULL(resource, L"MgdResourceService::DeleteResource");
if (resource->GetResourceType() == MgResourceType::FeatureSource)
{
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp 2013-06-09 15:15:51 UTC (rev 7590)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestResourceService.cpp 2013-06-09 15:31:54 UTC (rev 7591)
@@ -1153,11 +1153,11 @@
Ptr<MgByteReader> content = pService->GetResourceContent(resId);
}
ACE_DEBUG((LM_INFO, ACE_TEXT(" Execution Time: = %6.4f (s)\n"), ((GetTickCount()-lStart)/1000.0) ));
-
- //Evict all cached copies to avoid distortion of results due to caching
- cache->Clear();
ACE_DEBUG((LM_INFO, ACE_TEXT(" %d resource content items in cache\n"), (cache->GetCacheSize()) ));
+ //Evict all cached copies to avoid distortion of results due to caching
+ cache->Clear();
+
lStart = GetTickCount();
Ptr<MgStringCollection> contents;
ACE_DEBUG((LM_INFO, ACE_TEXT("\nTestResourceService::TestCase_BenchmarkGetResourceContents() - Multi-threaded GetResourceContents call (cold) \n")));
Modified: branches/2.4/MgDev/Desktop/UnitTest/main.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/main.cpp 2013-06-09 15:15:51 UTC (rev 7590)
+++ branches/2.4/MgDev/Desktop/UnitTest/main.cpp 2013-06-09 15:31:54 UTC (rev 7591)
@@ -24,14 +24,14 @@
#endif
#endif
-#define TEST_COORDINATE_SYSTEM 0
-#define TEST_LOG_MANAGER 0
+#define TEST_COORDINATE_SYSTEM 1
+#define TEST_LOG_MANAGER 1
#define TEST_RESOURCE_SERVICE 1
-#define TEST_FEATURE_SERVICE 0
-#define TEST_MAPPING_SERVICE 0
-#define TEST_PROFILING_SERVICE 0
-#define TEST_RENDERING_SERVICE 0
-#define TEST_TILE_SERVICE 0
+#define TEST_FEATURE_SERVICE 1
+#define TEST_MAPPING_SERVICE 1
+#define TEST_PROFILING_SERVICE 1
+#define TEST_RENDERING_SERVICE 1
+#define TEST_TILE_SERVICE 1
int main(int argc, char** argv)
{
Property changes on: branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7349,7396,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7349,7396,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7349,7396,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7349,7396,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7349,7396,7531,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7349,7396,7569-7570
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7349,7396,7531,7569-7570
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles:7349,7396,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles:7349,7396,7531,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7349,7396,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7349,7396,7531,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
More information about the mapguide-commits
mailing list