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 4E3C6200BB8 for ; Sat, 12 Nov 2016 09:42:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3CFA2160B00; Sat, 12 Nov 2016 08:42:46 +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 84CBF160AF4 for ; Sat, 12 Nov 2016 09:42:45 +0100 (CET) Received: (qmail 24811 invoked by uid 500); 12 Nov 2016 08:42:44 -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 24798 invoked by uid 99); 12 Nov 2016 08:42:44 -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; Sat, 12 Nov 2016 08:42:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0DCA8E0158; Sat, 12 Nov 2016 08:42:44 +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 Message-Id: <86396733f71b498ebb0ee690d16224ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: struts git commit: WW-4711 Disables searching stack by default Date: Sat, 12 Nov 2016 08:42:44 +0000 (UTC) archived-at: Sat, 12 Nov 2016 08:42:46 -0000 Repository: struts Updated Branches: refs/heads/master a5817fecb -> a5092a24f WW-4711 Disables searching stack by default Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5092a24 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5092a24 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5092a24 Branch: refs/heads/master Commit: a5092a24f20d541f4401e66bc1dca79fa86ce020 Parents: a5817fe Author: Lukasz Lenart Authored: Sat Nov 12 09:41:05 2016 +0100 Committer: Lukasz Lenart Committed: Sat Nov 12 09:41:05 2016 +0100 ---------------------------------------------------------------------- core/src/main/java/org/apache/struts2/util/TextProviderHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/a5092a24/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java index c6e9679..e66268d 100644 --- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java @@ -49,7 +49,7 @@ public class TextProviderHelper { * @return the message if found, otherwise the defaultMessage */ public static String getText(String key, String defaultMessage, List args, ValueStack stack) { - return getText(key, defaultMessage, args, stack, true); + return getText(key, defaultMessage, args, stack, false); } /**