diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-19 16:38:47 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-19 16:38:47 -0400 |
| commit | 5b7063e7c612f9447372f52ea337f37c0f0fb11d (patch) | |
| tree | 0d5a0d04cc4572d1ad63611b76ff81860573d61b /MediaBrowser.Api/HttpHandlers/UsersHandler.cs | |
| parent | a129c93c42ee02aa7ecdb9227552d18eac034b98 (diff) | |
| parent | 937d27ae9d6aa571ab9327f138bfba1b84c158db (diff) | |
Merge
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers/UsersHandler.cs')
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/UsersHandler.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs index e1fe638ca..136873574 100644 --- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs @@ -1,4 +1,5 @@ using System.Collections.Generic;
+using System.Threading.Tasks;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
@@ -7,9 +8,12 @@ namespace MediaBrowser.Api.HttpHandlers {
class UsersHandler : BaseJsonHandler<IEnumerable<User>>
{
- protected override IEnumerable<User> GetObjectToSerialize()
+ protected override Task<IEnumerable<User>> GetObjectToSerialize()
{
- return Kernel.Instance.Users;
+ return Task.Run(() =>
+ {
+ return Kernel.Instance.Users;
+ });
}
}
}
|