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 1D085200B39 for ; Fri, 24 Jun 2016 15:09:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1BBF6160A38; Fri, 24 Jun 2016 13:09:09 +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 627CD160A49 for ; Fri, 24 Jun 2016 15:09:08 +0200 (CEST) Received: (qmail 16365 invoked by uid 500); 24 Jun 2016 13:09:07 -0000 Mailing-List: contact dev-help@struts.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list dev@struts.apache.org Received: (qmail 16296 invoked by uid 99); 24 Jun 2016 13:09:07 -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; Fri, 24 Jun 2016 13:09:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD85FE049D; Fri, 24 Jun 2016 13:09:06 +0000 (UTC) From: victorsosa To: dev@struts.apache.org Reply-To: dev@struts.apache.org Message-ID: Subject: [GitHub] struts pull request #103: WW-4650 Json deserialization does not work in 2.5.... Content-Type: text/plain Date: Fri, 24 Jun 2016 13:09:06 +0000 (UTC) archived-at: Fri, 24 Jun 2016 13:09:09 -0000 GitHub user victorsosa opened a pull request: https://github.com/apache/struts/pull/103 WW-4650 Json deserialization does not work in 2.5.1 Fix for WW-4650 broked by WW-4558 and test cases changes too. You can merge this pull request into a Git repository by running: $ git pull https://github.com/victorsosa/struts WW-4650 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/struts/pull/103.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #103 ---- commit 7985fd191a39921817316f0f71348ffdd8233a4a Author: victor sosa Date: 2016-05-26T23:23:37Z Merge pull request #17 from apache/master update pull commit 4f07433626dc5bef4e626c00cf880e848ac70f80 Author: victorsosa Date: 2016-06-24T12:25:42Z Merge branch 'master' of https://github.com/apache/struts into apache-master commit b4622865893731277ac0034d54d26216f09b7054 Author: victorsosa Date: 2016-06-24T12:26:27Z Merge branch 'apache-master' commit 6e07a63797422994a96059188b1753597a22ffd1 Author: victorsosa Date: 2016-06-24T13:06:52Z WW-4650 Json deserialization does not work in 2.5.1 logic need to be changed as accept can be a list; the check need to be done in the list itself. Accept:application/json, text/plain, */* ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org For additional commands, e-mail: dev-help@struts.apache.org