From 1740d70845267bb4765f8430526f2db1f2a66c7c Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Wed, 19 Jun 2013 14:29:22 +0300 Subject: [PATCH] fixed warnings --- .../Common/ObjectUtils.cs | 9 +++------ .../HostedSolution/OrganizationController.cs | 11 ++++------- .../Log/AuditLog.cs | 5 +---- .../Provisioning/BackupController.cs | 5 ++--- .../Tasks/TaskManager.cs | 5 ++--- .../WebsitePanel.EnterpriseServer.Code.csproj | 3 --- 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs index 94ede9cb..4359ca98 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs @@ -212,7 +212,7 @@ namespace WebsitePanel.EnterpriseServer // try implicit type conversion props[i].SetValue(obj, propVal, null); } - catch (Exception ex) + catch { // convert to string and then set property value try @@ -220,14 +220,11 @@ namespace WebsitePanel.EnterpriseServer string strVal = propVal.ToString(); props[i].SetValue(obj, Cast(strVal, props[i].PropertyType), null); } - catch (Exception e) - { - // skip property init - } + catch { } } } } - catch (Exception e) { } // just skip + catch { } // just skip } // for properties } } diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs index 8162959d..95d5da6f 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs @@ -1694,8 +1694,8 @@ namespace WebsitePanel.EnterpriseServer // get mailbox settings Organizations orgProxy = GetOrganizationProxy(org.ServiceId); string accountName = GetAccountName(account.AccountName); - - + + OrganizationUser retUser = orgProxy.GetUserGeneralSettings(accountName, org.OrganizationId); retUser.AccountId = accountId; retUser.AccountName = account.AccountName; @@ -1706,13 +1706,10 @@ namespace WebsitePanel.EnterpriseServer retUser.IsLyncUser = DataProvider.CheckLyncUserExists(accountId); retUser.IsBlackBerryUser = BlackBerryController.CheckBlackBerryUserExists(accountId); retUser.SubscriberNumber = account.SubscriberNumber; - + return retUser; } - catch (Exception ex) - { - //throw TaskManager.WriteError(ex); - } + catch { } finally { TaskManager.CompleteTask(); diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Log/AuditLog.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Log/AuditLog.cs index e315d227..0b1a62e1 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Log/AuditLog.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Log/AuditLog.cs @@ -92,10 +92,7 @@ namespace WebsitePanel.EnterpriseServer DataProvider.AddAuditLogRecord(recordId, severityId, userId, username, packageId, itemId, itemName, startDate, finishDate, sourceName, taskName, executionLog); } - catch(Exception ex) - { - // skip error - } + catch { } } private static DateTime GetStartDate(DateTime d) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Provisioning/BackupController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Provisioning/BackupController.cs index 81406cdd..23d8864c 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Provisioning/BackupController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Provisioning/BackupController.cs @@ -806,9 +806,8 @@ namespace WebsitePanel.EnterpriseServer // return true; } - catch(Exception e) - { - // + catch + { // return false; } } diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs index b26a68a6..0e8ebe0b 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs @@ -531,9 +531,8 @@ namespace WebsitePanel.EnterpriseServer scheduledTasks.Add(task.ScheduleId, task); } } - catch (Exception e) - { - } + catch { } + return scheduledTasks; } diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj index e342df3f..1923fd2e 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj @@ -55,9 +55,6 @@ False ..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll - - ..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll - ..\..\Bin\WebsitePanel.Providers.Base.dll