[mapguide-commits] r7660 - trunk/MgDev/Server/src/Common/Manager

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-07-04 08:12:23 -0700 (Thu, 04 Jul 2013)
New Revision: 7660

Modified:
   trunk/MgDev/Server/src/Common/Manager/LogManager.cpp
Log:
#2307: Another issue exposed by our .net test runner. MgByteReader objects from log retrieval APIs don't have mime types, tripping up our result comparison preparations.

Modified: trunk/MgDev/Server/src/Common/Manager/LogManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/LogManager.cpp	2013-07-04 15:08:56 UTC (rev 7659)
+++ trunk/MgDev/Server/src/Common/Manager/LogManager.cpp	2013-07-04 15:12:23 UTC (rev 7660)
@@ -2752,7 +2752,8 @@
         ACE_OS::fclose(pReadFile);
     }
 
-    byteReader = MgUtil::GetByteReader(contents);
+    STRING mimeType = MgMimeType::Text;
+    byteReader = MgUtil::GetByteReader(contents, &mimeType);
 
     MG_LOGMANAGER_CATCH(L"MgLogManager.GetLogHeader")
     if (mgException != NULL)
@@ -2809,7 +2810,8 @@
         ACE_OS::fclose(pReadFile);
     }
 
-    byteReader = MgUtil::GetByteReader(contents);
+    STRING mimeType = MgMimeType::Text;
+    byteReader = MgUtil::GetByteReader(contents, &mimeType);
 
     MG_LOGMANAGER_CATCH(L"MgLogManager.GetLogContents")
     if (mgException != NULL)
@@ -2933,7 +2935,8 @@
         ACE_OS::fclose(pReadFile);
     }
 
-    byteReader = MgUtil::GetByteReader(contents);
+    STRING mimeType = MgMimeType::Text;
+    byteReader = MgUtil::GetByteReader(contents, &mimeType);
 
     MG_LOGMANAGER_CATCH(L"MgLogManager.GetLogContents")
     if (mgException != NULL)
@@ -3150,7 +3153,8 @@
     } // End of file selecting while loop
 
     // Put string into the byteReader that will be sent back
-    byteReader = MgUtil::GetByteReader(contents);
+    STRING mimeType = MgMimeType::Text;
+    byteReader = MgUtil::GetByteReader(contents, &mimeType);
 
     MG_LOGMANAGER_CATCH(L"MgLogManager.GetLogContents");
     if (mgException != NULL)