Merge branch '2.9'

cowtowncoder · cowtowncoder · commit 96c69de6ad61 · 2018-01-02T21:53:14.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java
@@ -132,9 +132,10 @@ public String getDescForKnownTypeIds() {
     private static boolean isJavaUtilCollectionClass(String clz, String type)
     {
         if (clz.startsWith("Collections$")) {
-            // 02-Jan-2017, tatu: As per [databind#1868], need to leave Unmodifiable variants as is
-            return ((clz.indexOf(type) > 0)
-                    && !clz.contains("Unmodifiable"));
+            // 02-Jan-2017, tatu: As per [databind#1868], may need to leave Unmodifiable variants as is
+            return (clz.indexOf(type) > 0)
+//                    && !clz.contains("Unmodifiable");
+                    ;
         }
         if (clz.startsWith("Arrays$")) {
             return (clz.indexOf(type) > 0);

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,10 @@ public String getDescForKnownTypeIds() {`
`132`	`132`	`private static boolean isJavaUtilCollectionClass(String clz, String type)`
`133`	`133`	`{`
`134`	`134`	`if (clz.startsWith("Collections$")) {`
`135`		`- // 02-Jan-2017, tatu: As per [databind#1868], need to leave Unmodifiable variants as is`
`136`		`- return ((clz.indexOf(type) > 0)`
`137`		`- && !clz.contains("Unmodifiable"));`
	`135`	`+ // 02-Jan-2017, tatu: As per [databind#1868], may need to leave Unmodifiable variants as is`
	`136`	`+ return (clz.indexOf(type) > 0)`
	`137`	`+// && !clz.contains("Unmodifiable");`
	`138`	`+ ;`
`138`	`139`	`}`
`139`	`140`	`if (clz.startsWith("Arrays$")) {`
`140`	`141`	`return (clz.indexOf(type) > 0);`