merge
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/59b0e40e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/59b0e40e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/59b0e40e Branch: refs/heads/master Commit: 59b0e40e00cec4f567d575b0467a3dce3fbaf8f2 Parents: ad5cc58 6e07a63 Author: victorsosa <victor.s...@peopleware.do> Authored: Mon Jun 27 09:59:30 2016 -0400 Committer: victorsosa <victor.s...@peopleware.do> Committed: Mon Jun 27 09:59:30 2016 -0400 ---------------------------------------------------------------------- .gitignore | 2 +- .../apache/struts2/json/JSONInterceptor.java | 144 ++++++++++--------- .../struts2/json/JSONInterceptorTest.java | 28 ++-- 3 files changed, 89 insertions(+), 85 deletions(-) ----------------------------------------------------------------------
