This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-jaxrs-providers.
commit 29a8566a087c4484c838e970c5c1bec454cd2fd1 Author: Tatu Saloranta <[email protected]> Date: Thu Feb 28 14:59:17 2013 -0800 Fix [JACKSON-891] in this project as well (from 2.1.5) --- .../com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java | 5 +++++ .../fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java | 2 ++ pom.xml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java index 4023e18..5c82831 100644 --- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java +++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java @@ -80,6 +80,11 @@ public final class AnnotationBundleKey */ @Override + public int hashCode() { + return _hashCode; + } + + @Override public String toString() { return "[Annotations: "+_annotations.length+", hash 0x"+Integer.toHexString(_hashCode) +", copied: "+_annotationsCopied+"]"; diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java index e6318d8..2be4bfd 100644 --- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java +++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java @@ -44,6 +44,8 @@ public class TestAnnotationBundleKey extends JaxrsTestBase assertEquals(key2, key2); assertEquals(key1dup, key1dup); assertEquals(key1immutable, key1immutable); + + assertEquals(key1.hashCode(), key1dup.hashCode()); // then inequality by content (even though both have 1 JSONP annotation) assertFalse(key1.equals(key2)); diff --git a/pom.xml b/pom.xml index a7e5820..e122ebb 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ <version.jackson.core>2.2.0-SNAPSHOT</version.jackson.core> <version.jackson.annotations>2.2.0-SNAPSHOT</version.jackson.annotations> - <version.jackson.smile>2.1.4-SNAPSHOT</version.jackson.smile> + <version.jackson.smile>${version.jackson.core}</version.jackson.smile> <version.jackson.xml>${version.jackson.core}</version.jackson.xml> <version.jackson.jaxb>${version.jackson.core}</version.jackson.jaxb> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
