SWEEP: Reviewed all catch blocks where Lucene uses EOFException and c…

…onverted them to use our IsEOFException() extension method (see apache#446).
NightOwl888 · Apr 14, 2021 · cc4a313 · cc4a313
1 parent 3f202f4
commit cc4a313
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs b/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs
@@ -248,7 +248,7 @@ protected override void Dispose(bool disposing)
         //                    {
         //                        x = @in.ReadInt32();
         //                    }
-        //                    catch (EndOfStreamException)
+        //                    catch (Exception e) when (e.IsEOFException())
         //                    {
         //                        changed = true;
         //                        break;

diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -622,12 +622,10 @@ public virtual bool Read(BytesRef @ref)
                 {
                     length = (ushort)inputStream.ReadInt16();
                 }
-#pragma warning disable CA1031 // Do not catch general exception types
-                catch (EndOfStreamException)
+                catch (Exception e) when (e.IsEOFException())
                 {
                     return false;
                 }
-#pragma warning restore CA1031 // Do not catch general exception types
 
                 @ref.Grow(length);
                 @ref.Offset = 0;
@@ -650,12 +648,10 @@ public virtual byte[] Read()
                 {
                     length = (ushort)inputStream.ReadInt16();
                 }
-#pragma warning disable CA1031 // Do not catch general exception types
-                catch (EndOfStreamException)
+                catch (Exception e) when (e.IsEOFException())
                 {
                     return null;
                 }
-#pragma warning restore CA1031 // Do not catch general exception types
 
                 if (Debugging.AssertsEnabled) Debugging.Assert(length >= 0, "Sanity: sequence length < 0: {0}", length);
                 byte[] result = new byte[length];