From notifications-return-5769-archive-asf-public=cust-asf.ponee.io@freemarker.apache.org Thu Sep 27 00:16:27 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 A3FFA180629 for ; Thu, 27 Sep 2018 00:16:26 +0200 (CEST) Received: (qmail 13786 invoked by uid 500); 26 Sep 2018 22:16:25 -0000 Mailing-List: contact notifications-help@freemarker.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.apache.org Delivered-To: mailing list notifications@freemarker.apache.org Received: (qmail 13775 invoked by uid 99); 26 Sep 2018 22:16:25 -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; Wed, 26 Sep 2018 22:16:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 900F5E0016; Wed, 26 Sep 2018 22:16:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.apache.org Message-Id: <6b0f545d47624b1e9d04a9eb51de7e62@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: freemarker git commit: Forward ported from 2.3-gae: FREEMARKER-104: In log and error messages due to no XPath implementation available, recommend adding Apache Xalan or Jaxen as dependency. Date: Wed, 26 Sep 2018 22:16:25 +0000 (UTC) Repository: freemarker Updated Branches: refs/heads/3 87e9359af -> a48b939f6 Forward ported from 2.3-gae: FREEMARKER-104: In log and error messages due to no XPath implementation available, recommend adding Apache Xalan or Jaxen as dependency. Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/a48b939f Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/a48b939f Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/a48b939f Branch: refs/heads/3 Commit: a48b939f6bf1faa48bb09be2dfb1ee486550a464 Parents: 87e9359 Author: ddekany Authored: Thu Sep 27 00:16:20 2018 +0200 Committer: ddekany Committed: Thu Sep 27 00:16:20 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/freemarker/dom/NodeListModel.java | 4 ++-- .../main/java/org/apache/freemarker/dom/NodeModel.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/a48b939f/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeListModel.java ---------------------------------------------------------------------- diff --git a/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeListModel.java b/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeListModel.java index 35c5bc1..b3a59c4 100644 --- a/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeListModel.java +++ b/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeListModel.java @@ -158,8 +158,8 @@ class NodeListModel extends SimpleSequence implements TemplateHashModel, _Unexpe XPathSupport xps = getXPathSupport(); if (xps == null) { throw new TemplateException( - "Can't try to resolve the XML query key, because no XPath support is available. " - + "This is either malformed or an XPath expression: " + key); + "No XPath support is available (add Apache Xalan or Jaxen as dependency). " + + "This is either malformed, or an XPath expression: " + key); } Object context = (size == 0) ? null : rawNodeList(); return xps.executeQuery(context, key); http://git-wip-us.apache.org/repos/asf/freemarker/blob/a48b939f/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeModel.java ---------------------------------------------------------------------- diff --git a/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeModel.java b/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeModel.java index 356a852..3a92f7f 100644 --- a/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeModel.java +++ b/freemarker-dom/src/main/java/org/apache/freemarker/dom/NodeModel.java @@ -88,7 +88,7 @@ abstract public class NodeModel implements TemplateNodeModelEx, TemplateHashMode // do nothing } if (xpathSupportClass == null && LOG.isWarnEnabled()) { - LOG.warn("No XPath support is available."); + LOG.warn("No XPath support is available. If you need it, add Apache Xalan or Jaxen as dependency."); } } @@ -149,13 +149,12 @@ abstract public class NodeModel implements TemplateNodeModelEx, TemplateHashMode } } else { XPathSupport xps = getXPathSupport(); - if (xps != null) { - return xps.executeQuery(node, key); - } else { + if (xps == null) { throw new TemplateException( - "Can't try to resolve the XML query key, because no XPath support is available. " - + "This is either malformed or an XPath expression: " + key); + "No XPath support is available (add Apache Xalan or Jaxen as dependency). " + + "This is either malformed, or an XPath expression: " + key); } + return xps.executeQuery(node, key); } }