diff --git a/Modbus.Net/ModBus.Net/ComConnector.cs b/Modbus.Net/ModBus.Net/ComConnector.cs index bf4e152..7d81dcf 100644 --- a/Modbus.Net/ModBus.Net/ComConnector.cs +++ b/Modbus.Net/ModBus.Net/ComConnector.cs @@ -15,7 +15,7 @@ namespace ModBus.Net public delegate byte[] GetDate(byte[] bts); - private GetDate mygetDate; + //private GetDate mygetDate; private readonly string _com; public ComConnector(string com, int timeoutTime) @@ -249,7 +249,6 @@ namespace ModBus.Net catch (Exception ex) { throw new Exception(ex.Message); - break; } } ReadBuf[nBytelen] = 0x00; diff --git a/Modbus.Net/ModBus.Net/TaskManager.cs b/Modbus.Net/ModBus.Net/TaskManager.cs index c1e3113..e264bc6 100644 --- a/Modbus.Net/ModBus.Net/TaskManager.cs +++ b/Modbus.Net/ModBus.Net/TaskManager.cs @@ -349,7 +349,7 @@ namespace ModBus.Net ReturnValues(new KeyValuePair>(machine.Id, ans)); } } - catch (Exception e) + catch (Exception) { if (ReturnValues != null) diff --git a/Modbus.Net/ModBus.Net/TcpConnector.cs b/Modbus.Net/ModBus.Net/TcpConnector.cs index cec9e35..ab345e2 100644 --- a/Modbus.Net/ModBus.Net/TcpConnector.cs +++ b/Modbus.Net/ModBus.Net/TcpConnector.cs @@ -32,7 +32,6 @@ namespace ModBus.Net private int _sendCount; private int _receiveCount; private int _errorCount; - private NetworkStream _stream; // 2MB 的接收缓冲区,目的是一次接收完服务器发回的消息 private readonly byte[] _receiveBuffer = new byte[1024]; @@ -89,7 +88,7 @@ namespace ModBus.Net { _timeoutObject.Reset(); _socketClient = new TcpClient(); - _socketClient.BeginConnect(_host, _port, new AsyncCallback(CallBackMethod), _socketClient); + _socketClient.BeginConnect(_host, _port, CallBackMethod, _socketClient); if (_timeoutObject.WaitOne(TimeoutTime, false)) { if (_isConnectionSuccessful) @@ -222,8 +221,9 @@ namespace ModBus.Net { await ConnectAsync(); } - - await _stream.WriteAsync(datagram, 0, datagram.Length); + + var stream = _socketClient.GetStream(); + await stream.WriteAsync(datagram, 0, datagram.Length); RefreshSendCount(); //this.AddInfo("send text len = " + datagramText.Length.ToString()); @@ -333,7 +333,8 @@ namespace ModBus.Net { try { - _stream.Close(); + var stream = _socketClient.GetStream(); + stream.Close(); _socketClient.Client.Shutdown(SocketShutdown.Both); _socketClient.Client.Close(); }