commit | 4b32979d6e3fa4663ab98bbccbd550dbe2dbb510 | [log] [tgz] |
---|---|---|
author | Tatu Saloranta <tsaloranta@gmail.com> | Mon Jan 25 20:02:59 2016 -0800 |
committer | Tatu Saloranta <tsaloranta@gmail.com> | Mon Jan 25 20:02:59 2016 -0800 |
tree | 40629329ca4fbd9e0fd6d9adfbd626394c95f8e2 | |
parent | ba50df6cdf93201aa49d152ddec42d13c25ba1f6 [diff] | |
parent | 18ad3bc3d0ae6421e0db3aa0e5fa21599a831aba [diff] |
Merge pull request #249 from sammyhk/master #248 - fix VerisonUti.versionFor() unintended to return null instead …
diff --git a/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java b/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java index 4c121ad..3896001 100644 --- a/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java +++ b/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java
@@ -71,7 +71,8 @@ */ public static Version versionFor(Class<?> cls) { - return packageVersionFor(cls); + Version version = packageVersionFor(cls); + return version == null ? Version.unknownVersion() : version; } /**
diff --git a/src/test/java/com/fasterxml/jackson/core/util/TestVersionUtil.java b/src/test/java/com/fasterxml/jackson/core/util/TestVersionUtil.java index eb8cebd..771b51f 100644 --- a/src/test/java/com/fasterxml/jackson/core/util/TestVersionUtil.java +++ b/src/test/java/com/fasterxml/jackson/core/util/TestVersionUtil.java
@@ -28,4 +28,9 @@ public void testPackageVersionMatches() { assertEquals(PackageVersion.VERSION, VersionUtil.versionFor(UTF8JsonGenerator.class)); } + + public void testVersionForUnknownVersion() { + // expecting return version.unknownVersion() instead of null + assertEquals(Version.unknownVersion(), VersionUtil.versionFor(TestVersionUtil.class)); + } }