Bug 1225798 - part 1: add better error reporting for reading list importer's ESE handling, r=MattN
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 23 Nov 2015 16:35:56 +0000
changeset 274061 2998cc7e851ff5313087dfd39c0b3fc065da30a7
parent 274060 57dbf05c9f5bce0c726723f5403e61fd2ae88dee
child 274062 80cc747d4e5e64f9e37e2eba98be52fcc772ad19
push id16394
push usergijskruitbosch@gmail.com
push dateWed, 25 Nov 2015 10:05:46 +0000
treeherderfx-team@80cc747d4e5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN
bugs1225798
milestone45.0a1
Bug 1225798 - part 1: add better error reporting for reading list importer's ESE handling, r=MattN
browser/components/migration/nsEdgeReadingListExtractor.cpp
--- a/browser/components/migration/nsEdgeReadingListExtractor.cpp
+++ b/browser/components/migration/nsEdgeReadingListExtractor.cpp
@@ -192,13 +192,19 @@ nsEdgeReadingListExtractor::ConvertJETEr
       return NS_ERROR_FILE_IS_LOCKED;
     case JET_errPermissionDenied:
     case JET_errAccessDenied:
       return NS_ERROR_FILE_ACCESS_DENIED;
     case JET_errInvalidFilename:
       return NS_ERROR_FILE_INVALID_PATH;
     case JET_errFileNotFound:
       return NS_ERROR_FILE_NOT_FOUND;
+    case JET_errDatabaseDirtyShutdown:
+      return NS_ERROR_FILE_CORRUPTED;
     default:
+      nsCOMPtr<nsIConsoleService> consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
+      wchar_t* msg = new wchar_t[80];
+      swprintf(msg, 80, MOZ_UTF16("Unexpected JET error from ESE database: %ld"), aError);
+      consoleService->LogStringMessage(msg);
       return NS_ERROR_FAILURE;
   }
 }