From b8b7fc30d0d27f2419e246942c44b1772bc23391 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 20 Oct 2015 22:41:51 -0700
Subject: [PATCH] further minor fixes

---
 .../databind/deser/std/AtomicReferenceDeserializer.java     | 6 +++---
 .../com/fasterxml/jackson/databind/type/ReferenceType.java  | 2 +-
 .../jackson/failing/TestConvertingSerializer357.java        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.java
index 53b23ba96f..c8a24969a4 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicReferenceDeserializer.java
@@ -65,7 +65,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanPro
         if (typeDeser != null) {
             typeDeser = typeDeser.forProperty(property);
         }
-        if (deser == _valueDeserializer && typeDeser == _valueTypeDeserializer) {
+        if ((deser == _valueDeserializer) && (typeDeser == _valueTypeDeserializer)) {
             return this;
         }
         return withResolved(typeDeser, deser);
@@ -84,8 +84,8 @@ public AtomicReference<?> deserialize(JsonParser jp, DeserializationContext ctxt
     }
 
     @Override
-    public Object[] deserializeWithType(JsonParser jp, DeserializationContext ctxt,
+    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer) throws IOException {
-        return (Object[]) typeDeserializer.deserializeTypedFromAny(jp, ctxt);
+        return typeDeserializer.deserializeTypedFromAny(jp, ctxt);
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/ReferenceType.java b/src/main/java/com/fasterxml/jackson/databind/type/ReferenceType.java
index 721c6a9a94..bf8941d631 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/ReferenceType.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/ReferenceType.java
@@ -156,7 +156,7 @@ protected JavaType _narrow(Class<?> subclass)
     public JavaType narrowContentsBy(Class<?> contentClass)
     {
         // Can do a quick check first:
-        if (contentClass == _referencedType.getRawClass()) {
+        if (_referencedType.hasRawClass(contentClass)) {
             return this;
         }
         return new ReferenceType(_class, _bindings,
diff --git a/src/test/java/com/fasterxml/jackson/failing/TestConvertingSerializer357.java b/src/test/java/com/fasterxml/jackson/failing/TestConvertingSerializer357.java
index 46aec414f5..740e9f7719 100644
--- a/src/test/java/com/fasterxml/jackson/failing/TestConvertingSerializer357.java
+++ b/src/test/java/com/fasterxml/jackson/failing/TestConvertingSerializer357.java
@@ -8,7 +8,7 @@
 public class TestConvertingSerializer357
     extends com.fasterxml.jackson.databind.BaseMapTest
 {
-    // [Issue#357]
+    // [databind#357]
     static class Value { }
 
     static class ListWrapper {
@@ -29,7 +29,7 @@ public List<String> convert(Value value) {
     /**********************************************************
      */
 
-    // [Issue#357]
+    // [databind#357]
     public void testConverterForList357() throws Exception {
         String json = objectWriter().writeValueAsString(new ListWrapper());
         assertEquals("{\"list\":[[\"Hello world!\"]]}", json);