You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/05/22 06:31:02 UTC
[5/7] struts git commit: Merge branch 'ww-4558' of
github.com:victorsosa/struts into ww-4558
Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558
# Conflicts:
# plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8b8135af
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8b8135af
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8b8135af
Branch: refs/heads/master
Commit: 8b8135af79550bf732d5aaa98ee7d3d5116e4b4b
Parents: 2fada1e bab451c
Author: victorsosa <vi...@peopleware.do>
Authored: Mon Feb 15 10:37:26 2016 -0400
Committer: victorsosa <vi...@peopleware.do>
Committed: Mon Feb 15 10:37:26 2016 -0400
----------------------------------------------------------------------
.../json/src/main/java/org/apache/struts2/json/JSONInterceptor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8b8135af/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
----------------------------------------------------------------------
diff --cc plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
index 207d014,0b4cf37..5beb8df
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
@@@ -186,7 -186,11 +186,8 @@@ public class JSONInterceptor extends Ab
return Action.NONE;
} else {
-<<<<<<< HEAD
++
LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", accept);
-=======
- LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", contentType);
->>>>>>> fab687a07e8d873c82465b29188100debf61097f
}
return invocation.invoke();