Fixed #220

Author: cowtowncoder

release-notes/VERSION

@@ -6,6 +6,10 @@ Project: jackson-dataformat-xml
 
 2.9.0 (not yet released)
 
+2.8.7 (not yet released)
+
+#220: Avoid root-level wrapping for Map-like types, not just Maps
+
 2.8.6 (12-Jan-2017)
 2.8.5 (14-Nov-2016)
 

src/main/java/com/fasterxml/jackson/dataformat/xml/util/TypeUtil.java

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml.util;
 
 import java.util.Collection;
-import java.util.Map;
 
 import com.fasterxml.jackson.databind.JavaType;
 
@@ -20,8 +19,9 @@ public static boolean isIndexedType(JavaType type)
             if (cls == byte[].class || cls == char[].class) {
                 return false;
             }
-            // issue#5: also, should not add wrapping for Maps
-            if (Map.class.isAssignableFrom(cls)) {
+            // Also, should not add wrapping for Maps
+            // [dataformat-xml#220]: nor map-like (Scala Map) types
+            if (type.isMapLikeType()) {
                 return false;
             }
             return true;