Merge branch '2.10' into 2.11

FasterXML · Jul 21, 2020 · 96501ad · 96501ad
2 parents b8b9144 + c13b0d5
commit 96501ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
@@ -1006,6 +1006,7 @@ protected JsonToken _handleExtraColumn(String value) throws IOException
  if (next == null) { // should end of record or input
  return _handleObjectRowEnd();
  }
+ System.err.println("... yet we did NOT skip");
  }
  }
  // 21-May-2015, tatu: Need to enter recovery mode, to skip remainder of the line

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -40,8 +40,10 @@ Project: jackson-datatypes-text
 
 2.10.5 (not yet released)
 
-#146: Jackson can't handle underscores in numbers
+#146: (yaml) Jackson can't handle underscores in numbers
  (reported by Sergey M; fix contributed by Conor W)
+#204: (csv) `CsvParser.Feature.ALLOW_TRAILING_COMMA` doesn't work with header columns
+ (reported by Björn M)
 
 2.10.4 (03-May-2020)