Merge branch 'dev' into trio

pymodbus-dev · Apr 22, 2021 · 12c3313 · 12c3313
2 parents 12af789 + c7a582b
commit 12c3313
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,7 @@ version 2.5.1
 * Bug fix TCP Repl server.
 * Support multiple UID's with REPL server.
 * Support serial for URL (sync serial client)
+* Bug fix/enhancements, close socket connections only on empty or invalid response
 
 version 2.5.0
 ----------------------------------------------------------

diff --git a/pymodbus/transaction.py b/pymodbus/transaction.py
@@ -217,19 +217,20 @@ def execute(self, request):
                                 "/Unable to decode response")
                             response = ModbusIOException(last_exception,
                                                          request.function_code)
+                        self.client.close()
                     if hasattr(self.client, "state"):
                         _logger.debug("Changing transaction state from "
                                       "'PROCESSING REPLY' to "
                                       "'TRANSACTION_COMPLETE'")
                         self.client.state = (
                             ModbusTransactionState.TRANSACTION_COMPLETE)
-                self.client.close()
+
                 return response
             except ModbusIOException as ex:
                 # Handle decode errors in processIncomingPacket method
                 _logger.exception(ex)
-                self.client.close()
                 self.client.state = ModbusTransactionState.TRANSACTION_COMPLETE
+                self.client.close()
                 return ex
 
     def _retry_transaction(self, retries, reason,

diff --git a/pymodbus/version.py b/pymodbus/version.py
@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 5, 1)
+version = Version('pymodbus', 2, 5, 1, "rc1")
 
 version.__name__ = 'pymodbus'  # fix epydoc error