From 7f7ed3d5b367a4339931d25c949298f3f83596e3 Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Tue, 30 Dec 2014 01:39:07 +0400 Subject: [PATCH] fix Calculate Spaces Disk Space scheduled Task --- .../CalculatePackagesDiskspaceTask.cs | 13 ++++++++----- .../WebsitePanel.Server/ServiceProvider.asmx.cs | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs index d4236bf1..021e536b 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs @@ -200,11 +200,14 @@ namespace WebsitePanel.EnterpriseServer //TaskManager.Write(String.Format("{0} - Invoke GetServiceItemsDiskSpace method ('{1}' items) - {2} attempt", // DateTime.Now, objItems.Count, attempt)); - ServiceProvider prov = new ServiceProvider(); - ServiceProviderProxy.Init(prov, serviceId); - ServiceProviderItemDiskSpace[] itemsDiskSpace = prov.GetServiceItemsDiskSpace(objItems.ToArray()); - if (itemsDiskSpace != null && itemsDiskSpace.Length > 0) - organizationDiskSpaces.AddRange(itemsDiskSpace); + if (objItems.Count > 0) + { + ServiceProvider prov = new ServiceProvider(); + ServiceProviderProxy.Init(prov, serviceId); + ServiceProviderItemDiskSpace[] itemsDiskSpace = prov.GetServiceItemsDiskSpace(objItems.ToArray()); + if (itemsDiskSpace != null && itemsDiskSpace.Length > 0) + organizationDiskSpaces.AddRange(itemsDiskSpace); + } return organizationDiskSpaces.ToArray(); } diff --git a/WebsitePanel/Sources/WebsitePanel.Server/ServiceProvider.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/ServiceProvider.asmx.cs index bf915d30..c517c6aa 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server/ServiceProvider.asmx.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server/ServiceProvider.asmx.cs @@ -160,6 +160,8 @@ namespace WebsitePanel.Server try { Log.WriteStart("'{0}' GetServiceItemsDiskSpace", ProviderSettings.ProviderName); + + if (items.Length == 0) return new ServiceProviderItemDiskSpace[] {}; return Provider.GetServiceItemsDiskSpace(UnwrapServiceProviderItems(items)); } catch (Exception ex)