Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 24776200B9D for ; Wed, 28 Sep 2016 10:37:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 23206160ADD; Wed, 28 Sep 2016 08:37:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5F7F9160AE2 for ; Wed, 28 Sep 2016 10:37:38 +0200 (CEST) Received: (qmail 45883 invoked by uid 500); 28 Sep 2016 08:37:37 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 45639 invoked by uid 99); 28 Sep 2016 08:37:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 08:37:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 336B1E0AD9; Wed, 28 Sep 2016 08:37:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Wed, 28 Sep 2016 08:37:38 -0000 Message-Id: <78f8175534c4439f94f84befe1e98488@git.apache.org> In-Reply-To: <4b54fff2aec3456394db1774042d1c53@git.apache.org> References: <4b54fff2aec3456394db1774042d1c53@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] struts git commit: Merge remote-tracking branch 'upstream/master' archived-at: Wed, 28 Sep 2016 08:37:39 -0000 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 Authored: Thu Aug 4 08:47:22 2016 +0100 Committer: gregh3269 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(-) ----------------------------------------------------------------------