Skip byte counting at EOF in ExtendedBufferedReader.read (#615).

Sort members.

Author: garydgregory

src/changes/changes.xml

@@ -60,6 +60,7 @@
       <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Escape quote char in printWithEscapes when QuoteMode is NONE (#609).</action>
       <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Quote value starting with comment marker in minimal quote mode (#610).</action>
       <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Escape leading comment marker in printWithEscapes (#614).</action>
+      <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Skip byte counting at EOF in ExtendedBufferedReader.read (#615).</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory, Indy, Sylvia van Os" issue="CSV-307">Add an "Android Compatibility" section to the web site.</action>
       <action type="add" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="CSV-325">Add CSVParser.Builder.setByteOffset(long) (#604).</action>

src/test/java/org/apache/commons/csv/CSVParserTest.java

@@ -691,27 +691,6 @@ void testGetBytePositionMultiCharacterDelimiterWithSupplementaryCharacter() thro
         }
     }
 
-    @Test
-    void testGetBytePositionWithSingleByteCharset() throws IOException {
-        // A single-byte charset cannot encode U+FFFF, the char value of the EOF sentinel.
-        // Byte counting must skip the EOF read so a valid file parses without throwing.
-        final String code = "a,b\nc,d\n";
-        try (CSVParser parser = CSVParser.builder()
-                .setReader(new StringReader(code))
-                .setFormat(CSVFormat.DEFAULT)
-                .setCharset(StandardCharsets.ISO_8859_1)
-                .setTrackBytes(true)
-                .get()) {
-            final CSVRecord first = parser.nextRecord();
-            final CSVRecord second = parser.nextRecord();
-            assertNotNull(first);
-            assertNotNull(second);
-            assertNull(parser.nextRecord());
-            assertEquals(0, first.getBytePosition());
-            assertEquals(4, second.getBytePosition());
-        }
-    }
-
     @Test
     void testGetBytePositionWithCharacterOffsetAndMultiBytePrefix() throws Exception {
         final String row0 = "é,x\n";
@@ -742,6 +721,27 @@ void testGetBytePositionWithCharacterOffsetAndMultiBytePrefix() throws Exception
         }
     }
 
+    @Test
+    void testGetBytePositionWithSingleByteCharset() throws IOException {
+        // A single-byte charset cannot encode U+FFFF, the char value of the EOF sentinel.
+        // Byte counting must skip the EOF read so a valid file parses without throwing.
+        final String code = "a,b\nc,d\n";
+        try (CSVParser parser = CSVParser.builder()
+                .setReader(new StringReader(code))
+                .setFormat(CSVFormat.DEFAULT)
+                .setCharset(StandardCharsets.ISO_8859_1)
+                .setTrackBytes(true)
+                .get()) {
+            final CSVRecord first = parser.nextRecord();
+            final CSVRecord second = parser.nextRecord();
+            assertNotNull(first);
+            assertNotNull(second);
+            assertNull(parser.nextRecord());
+            assertEquals(0, first.getBytePosition());
+            assertEquals(4, second.getBytePosition());
+        }
+    }
+
     @Test
     void testGetHeaderComment_HeaderComment1() throws IOException {
         try (CSVParser parser = CSVParser.parse(CSV_INPUT_HEADER_COMMENT, FORMAT_AUTO_HEADER)) {