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 DE136200C02 for ; Fri, 20 Jan 2017 22:29:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DCBB6160B48; Fri, 20 Jan 2017 21:29:59 +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 31E19160B34 for ; Fri, 20 Jan 2017 22:29:59 +0100 (CET) Received: (qmail 12882 invoked by uid 500); 20 Jan 2017 21:29:58 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 12869 invoked by uid 99); 20 Jan 2017 21:29:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2017 21:29:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id BDBA6C12C9 for ; Fri, 20 Jan 2017 21:29:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id YpeXd-JyMHpw for ; Fri, 20 Jan 2017 21:29:56 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 4159F5F365 for ; Fri, 20 Jan 2017 21:29:55 +0000 (UTC) Received: (qmail 12860 invoked by uid 99); 20 Jan 2017 21:29:54 -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, 20 Jan 2017 21:29:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47A01DFA6F; Fri, 20 Jan 2017 21:29:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Fri, 20 Jan 2017 21:29:54 -0000 Message-Id: <824ebd86efe54027a667feb6eaec7175@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker git commit: Fixed some minor oversights related to logging. archived-at: Fri, 20 Jan 2017 21:30:00 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 000de61c7 -> 101541099 Fixed some minor oversights related to logging. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9e642e7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9e642e7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9e642e7b Branch: refs/heads/2.3-gae Commit: 9e642e7b81ba0f2c5f598b2edbf5654f76aa9395 Parents: 000de61 Author: ddekany Authored: Fri Jan 20 22:29:06 2017 +0100 Committer: ddekany Committed: Fri Jan 20 22:29:06 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/cache/TemplateCache.java | 4 +++- src/main/java/freemarker/ext/jsp/TaglibFactory.java | 2 +- src/test/java/freemarker/test/servlet/Model2TesterServlet.java | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9e642e7b/src/main/java/freemarker/cache/TemplateCache.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/cache/TemplateCache.java b/src/main/java/freemarker/cache/TemplateCache.java index 4f62d05..469c7f9 100644 --- a/src/main/java/freemarker/cache/TemplateCache.java +++ b/src/main/java/freemarker/cache/TemplateCache.java @@ -701,7 +701,9 @@ public class TemplateCache { storage.remove(tk); } } - LOG.debug(debugName + " was removed from the cache, if it was there"); + if (debug) { + LOG.debug(debugName + " was removed from the cache, if it was there"); + } } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9e642e7b/src/main/java/freemarker/ext/jsp/TaglibFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/ext/jsp/TaglibFactory.java b/src/main/java/freemarker/ext/jsp/TaglibFactory.java index f9ae4e6..028bb16 100644 --- a/src/main/java/freemarker/ext/jsp/TaglibFactory.java +++ b/src/main/java/freemarker/ext/jsp/TaglibFactory.java @@ -521,7 +521,7 @@ public class TaglibFactory implements TemplateHashModel { addTldLocationsFromJarDirectoryEntryURL(url); } else { if (LOG.isDebugEnabled()) { - LOG.warn("Can't list entries under this URL; TLD-s won't be discovered here: " + LOG.debug("Can't list entries under this URL; TLD-s won't be discovered here: " + urlWithEF.getExternalForm()); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9e642e7b/src/test/java/freemarker/test/servlet/Model2TesterServlet.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/test/servlet/Model2TesterServlet.java b/src/test/java/freemarker/test/servlet/Model2TesterServlet.java index 8b41be9..e6414a8 100644 --- a/src/test/java/freemarker/test/servlet/Model2TesterServlet.java +++ b/src/test/java/freemarker/test/servlet/Model2TesterServlet.java @@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import freemarker.ext.servlet.FreemarkerServlet; import freemarker.template.utility.StringUtil; @@ -44,7 +45,7 @@ import freemarker.template.utility.StringUtil; */ public class Model2TesterServlet extends HttpServlet { - private static final Logger LOG = Logger.getLogger(Model2TesterServlet.class); + private static final Logger LOG = LoggerFactory.getLogger(Model2TesterServlet.class); public static final String VIEW_PARAM_NAME = "view"; public static final String ACTION_PARAM_NAME = "action";