Repository: struts Updated Branches: refs/heads/develop 92f38df89 -> 381e92757
logging missing text keys only after all resource bundles have been searched, see WW-4407 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/381e9275 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/381e9275 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/381e9275 Branch: refs/heads/develop Commit: 381e92757520af833c6cd94dc383a1206296f52d Parents: 92f38df Author: cnenning <cnenn...@apache.org> Authored: Mon Oct 13 13:19:54 2014 +0200 Committer: cnenning <cnenn...@apache.org> Committed: Mon Oct 13 13:19:54 2014 +0200 ---------------------------------------------------------------------- .../com/opensymphony/xwork2/util/LocalizedTextUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/381e9275/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java index ec7860e..b7e147f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java @@ -215,15 +215,17 @@ public class LocalizedTextUtil { try { return bundle.getString(aTextName); } catch (MissingResourceException e) { - if (devMode) { - LOG.warn("Missing key [#0] in bundle [#1]!", aTextName, bundleName); - } else if (LOG.isDebugEnabled()) { - LOG.debug("Missing key [#0] in bundle [#1]!", aTextName, bundleName); - } + // will be logged when not found in any bundle } } } + if (devMode) { + LOG.warn("Missing key [#0] in bundles [#1]!", aTextName, localList); + } else if (LOG.isDebugEnabled()) { + LOG.debug("Missing key [#0] in bundles [#1]!", aTextName, localList); + } + return null; }
