33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
diff --git a/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java b/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
|
|
index bf9a5f5..21d0886 100644
|
|
--- a/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
|
|
+++ b/jaxrs/providers/jackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJackson2Provider.java
|
|
@@ -64,7 +64,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
|
|
|
|
private ClassAnnotationKey(Class<?> clazz, Annotation[] annotations)
|
|
{
|
|
- this.annotations = new AnnotationBundleKey(annotations);
|
|
+ this.annotations = new AnnotationBundleKey(annotations, AnnotationBundleKey.class);
|
|
this.classKey = new ClassKey(clazz);
|
|
hash = this.annotations.hashCode();
|
|
hash = 31 * hash + classKey.hashCode();
|
|
@@ -104,7 +104,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
|
|
// not yet resolved (or not cached any more)? Resolve!
|
|
if (endpoint == null) {
|
|
ObjectMapper mapper = locateMapper(type, mediaType);
|
|
- endpoint = _configForReading(mapper, annotations);
|
|
+ endpoint = _configForReading(mapper, annotations, type);
|
|
_readers.put(key, endpoint);
|
|
}
|
|
ObjectReader reader = endpoint.getReader();
|
|
@@ -134,7 +134,7 @@ public class ResteasyJackson2Provider extends JacksonJaxbJsonProvider
|
|
// not yet resolved (or not cached any more)? Resolve!
|
|
if (endpoint == null) {
|
|
ObjectMapper mapper = locateMapper(type, mediaType);
|
|
- endpoint = _configForWriting(mapper, annotations);
|
|
+ endpoint = _configForWriting(mapper, annotations, type);
|
|
// and cache for future reuse
|
|
_writers.put(key, endpoint);
|
|
}
|
|
|