Merge branch '2.4'

Conflicts: src/main/java/com/fasterxml/jackson/dataformat/csv/impl/TextBuffer.java
FasterXML · Nov 3, 2014 · 1c60e9d · 1c60e9d
2 parents b512725 + 503aca7
commit 1c60e9d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -22,3 +22,9 @@ Jason Dunkelberger (dirkraft@github)
 
 * Suggested #32: Allow disabling of quoteChar
  (2.4.0)
+
+Wei Li (wli600@github)
+
+* Contributed fix for 54: Encounter ArrayIndexOutOfBoundsException in the corner case delimiter
+  or end-of-line happened to be the leading character of a segment buffer
+ (2.4.4)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -9,6 +9,12 @@ Project: jackson-dataformat-csv
 #53: Add a way to specify "null value" (String) for `CsvGenerator` to use when writing `null`s
  (part of `CsvSchema`; method `withNullValue()`)
 
+2.4.4 (not yet released)
+
+#54: Encounter ArrayIndexOutOfBoundsException in the corner case delimiter or end-of-line
+  happened to be the leading character of a segment buffer
+ (contributed by wli600@github)
+
 2.4.3 (04-Oct-2014)
 
 - Support JDK serializability of CsvMapper

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/TextBuffer.java b/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/TextBuffer.java
@@ -404,10 +404,9 @@ public int getCurrentSegmentSize() {
     }
 
     /**
-     * 
      * @param lastSegmentEnd End offset in the currently active segment,
-     *                       could be 0 in the case of first character is
-     *                       delimiter or end-of-line
+     *    could be 0 in the case of first character is
+     *    delimiter or end-of-line
      * @param trimTrailingSpaces Whether trailing spaces should be trimmed or not
      */
     public String finishAndReturn(int lastSegmentEnd, boolean trimTrailingSpaces)