Merge remote-tracking branch 'upstream/master' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b6be359b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b6be359b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b6be359b
Branch: refs/heads/master Commit: b6be359b0ea8461d8efcd681e3e2932e253194e3 Parents: 50fa265 ef9c661 Author: gregh3269 <gregh3...@gmail.com> Authored: Thu Aug 4 08:47:22 2016 +0100 Committer: gregh3269 <gregh3...@gmail.com> Committed: Thu Aug 4 08:47:22 2016 +0100 ---------------------------------------------------------------------- .../org/apache/struts2/util/URLDecoderUtil.java | 12 ++++ .../struts2/views/util/DefaultUrlHelper.java | 27 +++++--- .../apache/struts2/util/URLDecoderUtilTest.java | 7 ++ .../views/util/DefaultUrlHelperTest.java | 71 +++++--------------- 4 files changed, 53 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
