From notifications-return-5077-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Tue Mar 6 22:18:20 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B59EC180652 for ; Tue, 6 Mar 2018 22:18:19 +0100 (CET) Received: (qmail 15715 invoked by uid 500); 6 Mar 2018 21:18:18 -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 15706 invoked by uid 99); 6 Mar 2018 21:18:18 -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; Tue, 06 Mar 2018 21:18:18 +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 67167C0323 for ; Tue, 6 Mar 2018 21:18:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -11.731 X-Spam-Level: X-Spam-Status: No, score=-11.731 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_DEF_SPF_WL=-7.5] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id RUVNL_O1Kbv7 for ; Tue, 6 Mar 2018 21:18:17 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 7D0BC5F3F0 for ; Tue, 6 Mar 2018 21:18:16 +0000 (UTC) Received: (qmail 15633 invoked by uid 99); 6 Mar 2018 21:18:10 -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; Tue, 06 Mar 2018 21:18:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12C71F646D; Tue, 6 Mar 2018 21:18:10 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: (Minor code and JavaDoc cleanup...) Date: Tue, 6 Mar 2018 21:18:10 +0000 (UTC) Repository: incubator-freemarker Updated Branches: refs/heads/3 99174103a -> e4207a53e (Minor code and JavaDoc cleanup...) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e4207a53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e4207a53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e4207a53 Branch: refs/heads/3 Commit: e4207a53e390136d427c3e9e26171f4780af3fd6 Parents: 9917410 Author: ddekany Authored: Tue Mar 6 22:16:17 2018 +0100 Committer: ddekany Committed: Tue Mar 6 22:16:17 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/freemarker/core/Environment.java | 15 +++++---------- .../org/apache/freemarker/dom/JaxenXPathSupport.java | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e4207a53/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java index 4288197..9434990 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Environment.java @@ -229,7 +229,8 @@ public final class Environment extends MutableProcessingConfiguration xpathCache = Environment.getCurrentEnvironmentNotNull().getCurrentTemplateNotNull() + Map xpathCache = Environment.getCurrentEnvironmentNotNull().getCurrentTemplate() .getCustomState(XPATH_CACHE_ATTR); synchronized (xpathCache) { xpath = xpathCache.get(xpathQuery); @@ -177,7 +177,7 @@ class JaxenXPathSupport implements XPathSupport { try { Template raw = getTemplate(uri); _ObjectHolder docHolder = Environment.getCurrentEnvironmentNotNull() - .getCurrentTemplateNotNull().getCustomState(FM_DOM_NAVIAGOTOR_CACHED_DOM); + .getCurrentTemplate().getCustomState(FM_DOM_NAVIAGOTOR_CACHED_DOM); synchronized (docHolder) { Document doc = docHolder.get(); if (doc == null) {