Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558

Browse Source 
# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
This commit is contained in:
victorsosa
2016-02-15 10:34:15 -04:00
parent 0d49050381 fab687a07e
commit bab451c6d8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
+4
View File
@@ -186,7 +186,11 @@ public class JSONInterceptor extends AbstractInterceptor {
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();