Makes LoadData more efficient.

riganti · Oct 27, 2017 · 566489a · 566489a
1 parent 8a2ae3e
commit 566489a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/DotVVM.Core/Controls/GridViewDataSet.cs b/src/DotVVM.Core/Controls/GridViewDataSet.cs
@@ -339,7 +339,7 @@ protected virtual async Task NotifyRefreshRequired()
             }
         }
 
-        private async Task<GridViewDataSetLoadedData<T>> LoadData()
+        private Task<GridViewDataSetLoadedData<T>> LoadData()
         {
             if (OnLoadingData != null && OnLoadingDataAsync != null)
             {
@@ -348,15 +348,15 @@ private async Task<GridViewDataSetLoadedData<T>> LoadData()
 
             if (OnLoadingData != null)
             {
-                return OnLoadingData(CreateGridViewDataSetLoadOptions());
+                return Task.FromResult(OnLoadingData(CreateGridViewDataSetLoadOptions()));
             }
 
             if (OnLoadingDataAsync != null)
             {
-                return await OnLoadingDataAsync(CreateGridViewDataSetLoadOptions());
+                return OnLoadingDataAsync(CreateGridViewDataSetLoadOptions());
             }
 
-            return null;
+            return Task.FromResult<GridViewDataSetLoadedData<T>>(null);
         }
     }