Update release notes wrt #352 (follow-up to #285)

FasterXML · Nov 17, 2022 · cd59497 · cd59497
1 parent 53cf263
commit cd59497
Show file tree

Hide file tree

Showing 3 changed files with 12 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
@@ -863,7 +863,7 @@ protected void _readHeaderLine() throws IOException {
         }
         // [dataformats-text#285]: Are we missing something?
         int diff = schemaColumnCount - newColumnCount;
-        if (Feature.FAIL_ON_MISSING_HEADER_COLUMNS.enabledIn(_formatFeatures) && diff > 0) {
+        if ((diff > 0) && Feature.FAIL_ON_MISSING_HEADER_COLUMNS.enabledIn(_formatFeatures)) {
             Set<String> oldColumnNames = new LinkedHashSet<>();
             _schema.getColumnNames(oldColumnNames);
             oldColumnNames.removeAll(newSchema.getColumnNames());

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -214,7 +214,13 @@ Jim Talbut (Yaytay@github)
 Simon Dean (msmsimondean@github)
 * Requested #244: (yaml) Add `YAMLGenerator.Feature.ALLOW_LONG_KEYS` to allow writing keys
   longer than 128 characters (default)
+ (2.14.0)
 
 Shauni Arima (ShauniArima@github)
 * Contributed #244: (yaml) Add `YAMLGenerator.Feature.ALLOW_LONG_KEYS` to allow writing keys
   longer than 128 characters (default)
+ (2.14.0)
+
+Matteo Giordano (malteo@github)
+* Contributed fix for #352: Disabling `CsvParser.Feature.FAIL_ON_MISSING_HEADER_COLUMNS` has no effect
+ (2.14.1)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,11 @@ Active Maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.14.1 (not yet released)
+
+#352: Disabling `CsvParser.Feature.FAIL_ON_MISSING_HEADER_COLUMNS` has no effect
+ (fix contributed by Matteo G)
+
 2.14.0 (05-Nov-2022)
 
 #169: (properties) Need a way to escape dots in property keys (add path separator configuration)