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/bab451c6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bab451c6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bab451c6 Branch: refs/heads/master Commit: bab451c6d80ee9b2685570d797e505768ff8bbe4 Parents: 0d49050 fab687a Author: victorsosa <victor.s...@peopleware.do> Authored: Mon Feb 15 10:34:15 2016 -0400 Committer: victorsosa <victor.s...@peopleware.do> Committed: Mon Feb 15 10:34:15 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/struts2/json/JSONInterceptor.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/bab451c6/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,11488fe..0b4cf37 --- 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 -181,7 +186,11 @@@ 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();
