aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-13 23:05:19 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-13 23:05:19 -0400
commitf2a9b76be2d6e616b510ed71cb7858b3757ec74d (patch)
tree96739d4cf59e8b8df5e1ef2aa16af453863cf12e
parent587d3c1908287c8f6c893355c18a4d5d15541952 (diff)
fixed null reference in user manager
-rw-r--r--MediaBrowser.Server.Implementations/Library/UserManager.cs4
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs6
2 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index dbb2d7b32..6a162d154 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -106,10 +106,12 @@ namespace MediaBrowser.Server.Implementations.Library
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="configurationManager">The configuration manager.</param>
- public UserManager(ILogger logger, IServerConfigurationManager configurationManager)
+ /// <param name="userDataRepository">The user data repository.</param>
+ public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository)
{
_logger = logger;
ConfigurationManager = configurationManager;
+ _userDataRepository = userDataRepository;
}
#region Events
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 59395e469..11a262ef8 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -220,12 +220,12 @@ namespace MediaBrowser.ServerApplication
ZipClient = new DotNetZipClient();
RegisterSingleInstance(ZipClient);
- UserManager = new UserManager(Logger, ServerConfigurationManager);
- RegisterSingleInstance(UserManager);
-
UserDataRepository = new SQLiteUserDataRepository(ApplicationPaths, JsonSerializer, LogManager);
RegisterSingleInstance(UserDataRepository);
+ UserManager = new UserManager(Logger, ServerConfigurationManager, UserDataRepository);
+ RegisterSingleInstance(UserManager);
+
LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataRepository);
RegisterSingleInstance(LibraryManager);