Merge

1 files changed, 5 insertions, 4 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/YearHandler.cs b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
index 89cde9943..dfde600e7 100644
--- a/MediaBrowser.Api/HttpHandlers/YearHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
@@ -1,6 +1,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

+using System.Threading.Tasks;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

 using MediaBrowser.Model.DTO;

@@ -13,7 +14,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// </summary>

     public class YearHandler : BaseJsonHandler<IBNItem<Year>>

     {

-        protected override IBNItem<Year> GetObjectToSerialize()

+        protected override async Task<IBNItem<Year>> GetObjectToSerialize()

         {

             Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;

             Guid userId = Guid.Parse(QueryString["userid"]);

@@ -21,13 +22,13 @@ namespace MediaBrowser.Api.HttpHandlers
 

             string year = QueryString["year"];

 

-            return GetYear(parent, user, int.Parse(year));

+            return await GetYear(parent, user, int.Parse(year));

         }

 

         /// <summary>

         /// Gets a Year

         /// </summary>

-        private IBNItem<Year> GetYear(Folder parent, User user, int year)

+        private async Task<IBNItem<Year>> GetYear(Folder parent, User user, int year)

         {

             int count = 0;

 

@@ -45,7 +46,7 @@ namespace MediaBrowser.Api.HttpHandlers
             // Get the original entity so that we can also supply the PrimaryImagePath

             return new IBNItem<Year>()

             {

-                Item = Kernel.Instance.ItemController.GetYear(year),

+                Item = await Kernel.Instance.ItemController.GetYear(year),

                 BaseItemCount = count

             };

         }