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 5DAE8200B51 for ; Mon, 18 Jul 2016 08:01:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5C4CB160A6C; Mon, 18 Jul 2016 06:01:33 +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 9D3EE160A7C for ; Mon, 18 Jul 2016 08:01:32 +0200 (CEST) Received: (qmail 4729 invoked by uid 500); 18 Jul 2016 06:01:30 -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 3213 invoked by uid 99); 18 Jul 2016 06:01:29 -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; Mon, 18 Jul 2016 06:01:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 962FADFF46; Mon, 18 Jul 2016 06:01:29 +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: Mon, 18 Jul 2016 06:01:40 -0000 Message-Id: <3c28c6d4935347a1a84b2dfb51fdf86d@git.apache.org> In-Reply-To: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> References: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/15] struts git commit: merge archived-at: Mon, 18 Jul 2016 06:01:33 -0000 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 Authored: Mon Jun 27 09:59:30 2016 -0400 Committer: victorsosa 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(-) ----------------------------------------------------------------------