Merge pull request #785 from oclancy/SocketErrorCode_Change

Update SocketReader::ReadSome SocketError when socket closed
connamara · Jan 24, 2024 · 07a94c5 · 07a94c5
2 parents a6efe80 + 84e06a2
commit 07a94c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/QuickFIXn/SocketInitiatorThread.cs b/QuickFIXn/SocketInitiatorThread.cs
@@ -151,7 +151,7 @@ protected int ReadSome(byte[] buffer, int timeoutMilliseconds)
 
                     int bytesRead = stream_.EndRead(request);
                     if (0 == bytesRead)
-                        throw new SocketException(System.Convert.ToInt32(SocketError.ConnectionReset));
+                        throw new SocketException(System.Convert.ToInt32(SocketError.Shutdown));
 
                     return bytesRead;
                 }

diff --git a/QuickFIXn/SocketReader.cs b/QuickFIXn/SocketReader.cs
@@ -94,7 +94,7 @@ protected virtual int ReadSome(byte[] buffer, int timeoutMilliseconds)
 
                     int bytesRead = _stream.EndRead(request);
                     if (0 == bytesRead)
-                        throw new SocketException(System.Convert.ToInt32(SocketError.ConnectionReset));
+                        throw new SocketException(System.Convert.ToInt32(SocketError.Shutdown));
 
                     return bytesRead;
                 }

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -44,7 +44,7 @@ What's New
 * #764 - fix positive UTC offset parsing in DateTimeConverter (Rob-Hague)
 * #766 - use ordinal string operations (Rob-Hague)
 * #767 - Avoid string conversions in FieldMap.Get{FieldType} where possible (Rob-Hague)
-
+* #785 - use correct SocketError "Shutdown" code when socket is deliberately shutdown (oclancy)
 
 ### v1.11.2:
 * same as v1.11.1, but I fixed the readme in the pushed nuget packages