From 9a6968f618d573a45f8b47a1cf9e2724475dc1d7 Mon Sep 17 00:00:00 2001 From: vdemydiuk Date: Sat, 26 Nov 2016 19:27:09 +0200 Subject: [PATCH] Refactoring MtApi --- MTApiService/MtClient.cs | 10 ++-------- MTApiService/MtExecutorManager.cs | 2 +- MTApiService/MtExpert.cs | 2 +- MtApi/MtApiClient.cs | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/MTApiService/MtClient.cs b/MTApiService/MtClient.cs index 68164915..750e21d9 100755 --- a/MTApiService/MtClient.cs +++ b/MTApiService/MtClient.cs @@ -100,7 +100,7 @@ namespace MTApiService return; } - var coonected = false; + bool coonected; try { @@ -254,13 +254,7 @@ namespace MTApiService public string Host { get; private set; } public int Port { get; private set; } - private bool IsConnected - { - get - { - return _proxy.State == CommunicationState.Opened; - } - } + private bool IsConnected => _proxy.State == CommunicationState.Opened; #endregion diff --git a/MTApiService/MtExecutorManager.cs b/MTApiService/MtExecutorManager.cs index 230418c1..14facafe 100755 --- a/MTApiService/MtExecutorManager.cs +++ b/MTApiService/MtExecutorManager.cs @@ -82,7 +82,7 @@ namespace MTApiService Log.DebugFormat("SendTask: begin. command = {0}", command); - ITaskExecutor executor = null; + ITaskExecutor executor; lock (_locker) { diff --git a/MTApiService/MtExpert.cs b/MTApiService/MtExpert.cs index 0b90053e..b609ec50 100755 --- a/MTApiService/MtExpert.cs +++ b/MTApiService/MtExpert.cs @@ -153,7 +153,7 @@ namespace MTApiService Log.Debug("DequeueTask: called."); MtCommandTask task; - int count = 0; + int count; lock (_locker) { diff --git a/MtApi/MtApiClient.cs b/MtApi/MtApiClient.cs index 977525db..fa6f9ac6 100755 --- a/MtApi/MtApiClient.cs +++ b/MtApi/MtApiClient.cs @@ -1780,7 +1780,7 @@ namespace MtApi private void Disconnect(bool failed) { - var state = failed ? MtConnectionState.Disconnected : MtConnectionState.Disconnected; + var state = failed ? MtConnectionState.Failed : MtConnectionState.Disconnected; var message = failed ? "Connection Failed" : "Disconnected"; lock (_locker)