Skip to content

Commit 110c1a1

Browse files
committed
Merge branch '2.5' into 2.6
2 parents 1fb1e27 + 25e7dd0 commit 110c1a1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

release-notes/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ No changes since 2.6.3.
6666
- Add `JsonParser.Feature.IGNORE_UNDEFINED`, useful for data formats like protobuf
6767
- Optimize writing of String names (remove intermediate copy; with JDK7 no speed benefit)
6868

69-
2.5.5 (not yet released)
69+
2.5.5 (07-Dec-2015)
7070

7171
#220: Problem with `JsonParser.nextFieldName(SerializableString)` for byte-backed parser
7272
#221: Fixed ArrayIndexOutOfBounds exception for character-based `JsonGenerator`

src/main/java/com/fasterxml/jackson/core/Version.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ public Version(int major, int minor, int patchLevel, String snapshotInfo,
6565
public static Version unknownVersion() { return UNKNOWN_VERSION; }
6666

6767
public boolean isUknownVersion() { return (this == UNKNOWN_VERSION); }
68+
69+
// Added in patch 2.6.6 (added for good in 2.7)
70+
public boolean isUnknownVersion() { return (this == UNKNOWN_VERSION); }
71+
6872
public boolean isSnapshot() { return (_snapshotInfo != null && _snapshotInfo.length() > 0); }
6973

7074
public int getMajorVersion() { return _majorVersion; }

0 commit comments

Comments
 (0)