From 9773b484099726a62983b9b271b981361f67c264 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 27 Nov 2019 12:47:31 -0800 Subject: [PATCH] Fix #166 --- .travis.yml | 9 +++++++++ .../jackson/dataformat/csv/impl/CsvDecoder.java | 2 +- release-notes/VERSION-2.x | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ee56ff9..d3db80d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,18 @@ language: java +git: + quiet: true + submodules: false + jdk: - openjdk8 - openjdk11 +# 2019-11-27, tatu: Let's try caching Maven dependencies +cache: + directories: + - $HOME/.m2 + # whitelist branches: only: diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java index 4b41f6c9..4c5e9ac8 100644 --- a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java +++ b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java @@ -865,7 +865,7 @@ protected String _nextQuotedString() throws IOException continue; } _owner._reportUnexpectedCsvChar(ch, String.format( - "Expected separator (%s) or end-of-line", _getCharDesc(_quoteChar))); + "Expected separator (%s) or end-of-line", _getCharDesc(_separatorChar))); } return result; } diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index a5719873..82fd89b4 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -8,6 +8,11 @@ Modules: === Releases === ------------------------------------------------------------------------ +2.10.2 (not yet released) + +#166: (csv) Incorrect `JsonParseException` Message for missing separator char + (reported by gimiz@github) + 2.10.1 (09-Nov-2019) #15: Add a `CsvParser.Feature.SKIP_EMPTY_LINES` to allow skipping empty rows