Merge branch 'develop' into dependabot

Rob-Hague · Rob-Hague · commit 6e4f872722f6 · 2025-02-04T21:41:23.000+01:00
diff --git a/src/Renci.SshNet/BaseClient.cs b/src/Renci.SshNet/BaseClient.cs
@@ -502,6 +502,14 @@ private void SendKeepAliveMessage()
                 {
                     _ = session.TrySendMessage(new IgnoreMessage());
                 }
+                catch (ObjectDisposedException)
+                {
+                    // ignore
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error sending keepalive message");
+                }
                 finally
                 {
                     Monitor.Exit(_keepAliveLock);

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,14 @@ private void SendKeepAliveMessage()`
`502`	`502`	`{`
`503`	`503`	`_ = session.TrySendMessage(new IgnoreMessage());`
`504`	`504`	`}`
	`505`	`+ catch (ObjectDisposedException)`
	`506`	`+ {`
	`507`	`+ // ignore`
	`508`	`+ }`
	`509`	`+ catch (Exception ex)`
	`510`	`+ {`
	`511`	`+ _logger.LogError(ex, "Error sending keepalive message");`
	`512`	`+ }`
`505`	`513`	`finally`
`506`	`514`	`{`
`507`	`515`	`Monitor.Exit(_keepAliveLock);`