Merge branch 'dev' into beta

1 files changed, 1 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index ae839e6ee..eef8c5193 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -190,7 +190,6 @@ namespace MediaBrowser.Server.Startup.Common
         internal IItemRepository ItemRepository { get; set; }
         private INotificationsRepository NotificationsRepository { get; set; }
         private IFileOrganizationRepository FileOrganizationRepository { get; set; }
-        private IProviderRepository ProviderRepository { get; set; }
 
         private INotificationManager NotificationManager { get; set; }
         private ISubtitleManager SubtitleManager { get; set; }
@@ -339,7 +338,7 @@ namespace MediaBrowser.Server.Startup.Common
                 }
                 catch (Exception ex)
                 {
-                    Logger.ErrorException("Error in {0}", ex, entryPoint.GetType().Name);
+                    Logger.ErrorException("Error in {0}", ex, entryPoint.GetType().FullName);
                 }
             });
 
@@ -418,10 +417,6 @@ namespace MediaBrowser.Server.Startup.Common
             ItemRepository = itemRepo;
             RegisterSingleInstance(ItemRepository);
 
-            var providerRepo = new SqliteProviderInfoRepository(LogManager, ApplicationPaths);
-            ProviderRepository = providerRepo;
-            RegisterSingleInstance(ProviderRepository);
-
             FileOrganizationRepository = await GetFileOrganizationRepository().ConfigureAwait(false);
             RegisterSingleInstance(FileOrganizationRepository);
 
@@ -564,7 +559,6 @@ namespace MediaBrowser.Server.Startup.Common
             await displayPreferencesRepo.Initialize(NativeApp.GetDbConnector()).ConfigureAwait(false);
             await ConfigureUserDataRepositories().ConfigureAwait(false);
             await itemRepo.Initialize(NativeApp.GetDbConnector()).ConfigureAwait(false);
-            await providerRepo.Initialize(NativeApp.GetDbConnector()).ConfigureAwait(false);
             ((LibraryManager)LibraryManager).ItemRepository = ItemRepository;
             await ConfigureNotificationsRepository().ConfigureAwait(false);
             progress.Report(100);