[mapguide-commits] r8100 - in branches/2.6/MgDev/Server/src: Core Services/Resource

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-05-02 05:25:18 -0700 (Fri, 02 May 2014)
New Revision: 8100

Modified:
   branches/2.6/MgDev/Server/src/Core/Makefile.am
   branches/2.6/MgDev/Server/src/Services/Resource/DbEnvironment.cpp
Log:
Merge r8098 (for #2397) and r8099 to 2.6

Modified: branches/2.6/MgDev/Server/src/Core/Makefile.am
===================================================================
--- branches/2.6/MgDev/Server/src/Core/Makefile.am	2014-05-01 17:38:42 UTC (rev 8099)
+++ branches/2.6/MgDev/Server/src/Core/Makefile.am	2014-05-02 12:25:18 UTC (rev 8100)
@@ -214,6 +214,12 @@
 	@cp -f ../../../UnitTest/TestData/FeatureService/SHP/Redding_Parcels.dbf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/FeatureService/SHP/Redding_Parcels.shx ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/MappingService/UT_AllElements.pl ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_MultiCTS.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_MultiCTSWithTheme.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_MultiFTS.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_MultiFTSSingleCTS.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_MultiFTSWithTheme.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/MappingService/UT_SingleFTSMultiCTS.ldf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/MappingService/UT_NoLegend.pl ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/MappingService/UT_SymbolMart.sl ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/MappingService/UT_Symbols.dwf ../UnitTestFiles

Modified: branches/2.6/MgDev/Server/src/Services/Resource/DbEnvironment.cpp
===================================================================
--- branches/2.6/MgDev/Server/src/Services/Resource/DbEnvironment.cpp	2014-05-01 17:38:42 UTC (rev 8099)
+++ branches/2.6/MgDev/Server/src/Services/Resource/DbEnvironment.cpp	2014-05-02 12:25:18 UTC (rev 8100)
@@ -236,7 +236,7 @@
         }
         catch (...)
         {
-            assert(false);
+            //assert(false);
         }
     }
 }