Merge branch '2.7' into 2.8

cowtowncoder · cowtowncoder · commit 90042692085d · 2017-04-26T20:22:54.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
@@ -58,6 +58,7 @@ public class BeanDeserializerFactory
         s.add("org.codehaus.groovy.runtime.MethodClosure");
         s.add("org.springframework.beans.factory.ObjectFactory");
         s.add("com.sun.org.apache.xalan.internal.xsltc.trax.TemplatesImpl");
+        s.add("org.apache.xalan.xsltc.trax.TemplatesImpl");
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public class BeanDeserializerFactory`
`58`	`58`	`s.add("org.codehaus.groovy.runtime.MethodClosure");`
`59`	`59`	`s.add("org.springframework.beans.factory.ObjectFactory");`
`60`	`60`	`s.add("com.sun.org.apache.xalan.internal.xsltc.trax.TemplatesImpl");`
	`61`	`+ s.add("org.apache.xalan.xsltc.trax.TemplatesImpl");`
`61`	`62`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`62`	`63`	`}`
`63`	`64`