aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-19 16:38:31 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-19 16:38:31 -0400
commit937d27ae9d6aa571ab9327f138bfba1b84c158db (patch)
tree94be178039621ea6d6235967414b0849912af4ed /MediaBrowser.Api/HttpHandlers/UsersHandler.cs
parent64887fa74347260d44a8cb5cc7058cd22b08c1c5 (diff)
One async call leads to another, and another, all the way up the call stack...
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers/UsersHandler.cs')
-rw-r--r--MediaBrowser.Api/HttpHandlers/UsersHandler.cs8
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;
+ });
}
}
}