Repository: struts Updated Branches: refs/heads/support-2-3 6dd6e5cfb -> cf53b5964
Fixes post cherry-pick Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cf53b596 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cf53b596 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cf53b596 Branch: refs/heads/support-2-3 Commit: cf53b59647aaa7aa4bb69682a8a53dbfdcce8462 Parents: 6dd6e5c Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Aug 24 11:09:29 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Aug 24 11:09:29 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/struts2/rest/handler/XStreamHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/cf53b596/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java ---------------------------------------------------------------------- diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java index 2090742..d0f9680 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java @@ -23,6 +23,8 @@ package org.apache.struts2.rest.handler; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.security.ArrayTypePermission; import com.thoughtworks.xstream.security.ExplicitTypePermission; @@ -30,8 +32,6 @@ import com.thoughtworks.xstream.security.NoTypePermission; import com.thoughtworks.xstream.security.NullPermission; import com.thoughtworks.xstream.security.PrimitiveTypePermission; import com.thoughtworks.xstream.security.TypePermission; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.io.IOException; import java.io.Reader; @@ -46,7 +46,7 @@ import java.util.Set; */ public class XStreamHandler extends AbstractContentTypeHandler { - private static final Logger LOG = LogManager.getLogger(XStreamHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(XStreamHandler.class); public String fromObject(ActionInvocation invocation, Object obj, String resultCode, Writer out) throws IOException { if (obj != null) { @@ -125,7 +125,6 @@ public class XStreamHandler extends AbstractContentTypeHandler { private static final TypePermission COLLECTIONS = new CollectionTypePermission(); - @Override public boolean allows(Class type) { return type != null && type.isInterface() && (Collection.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type));
