Skip to content

Commit

Permalink
Fix #1191
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Apr 12, 2016
1 parent d58eec6 commit c732f82
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Project: jackson-databind
------------------------------------------------------------------------

2.7.4 (not yet released)

#1178: `@JsonSerialize(contentAs=superType)` behavior disallowed in 2.7
#1191: Non-matching quotes used in error message for date parsing
#1194: Incorrect signature for generic type via `JavaType.getGenericSignature
- Improve handling of custom content (de)serializers for `AtomicReference`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,12 @@ public static Date parse(String date, ParsePosition pos) throws ParseException {
} catch (IllegalArgumentException e) {
fail = e;
}
String input = (date == null) ? null : ('"' + date + "'");
String input = (date == null) ? null : ('"' + date + '"');
String msg = fail.getMessage();
if (msg == null || msg.isEmpty()) {
msg = "("+fail.getClass().getName()+")";
}
ParseException ex = new ParseException("Failed to parse date [" + input + "]: " + msg, pos.getIndex());
ParseException ex = new ParseException("Failed to parse date " + input + ": " + msg, pos.getIndex());
ex.initCause(fail);
throw ex;
}
Expand Down

0 comments on commit c732f82

Please sign in to comment.