You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2018/05/21 05:24:17 UTC

[struts] 01/01: Merge pull request #221 from yasserzamani/WW-4932

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit b2dcd87533ec6f0d136c1650c275d3dc9a6ef399
Merge: e7ed6e3 b37c09e
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Mon May 21 07:24:14 2018 +0200

    Merge pull request #221 from yasserzamani/WW-4932
    
     WW-4932 honor .properties file before the generic parametrics

 .../impl/DefaultObjectTypeDeterminer.java          | 26 +++++++-------
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java |  2 +-
 .../xwork2/ognl/OgnlValueStackTest.java            |  8 +++++
 .../xwork2/util/{Cat.java => Animal.java}          | 42 ++--------------------
 .../java/com/opensymphony/xwork2/util/Cat.java     |  2 +-
 .../java/com/opensymphony/xwork2/util/Foo.java     | 11 +++++-
 .../xwork2/util/{Cat.java => MyNumber.java}        | 41 +--------------------
 .../xwork2/util/Foo-conversion.properties          |  3 +-
 8 files changed, 38 insertions(+), 97 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.